diff --git a/plugins/poll/assets/javascripts/controllers/poll.js.es6 b/plugins/poll/assets/javascripts/controllers/poll.js.es6
index ef3ebce95fc..4e386712fad 100644
--- a/plugins/poll/assets/javascripts/controllers/poll.js.es6
+++ b/plugins/poll/assets/javascripts/controllers/poll.js.es6
@@ -1,8 +1,8 @@
-export default Em.Controller.extend({
-  isMultiple: Em.computed.equal("poll.type", "multiple"),
-  isNumber: Em.computed.equal("poll.type", "number"),
-  isRandom : Em.computed.equal("poll.order", "random"),
-  isClosed: Em.computed.equal("poll.status", "closed"),
+export default Ember.Controller.extend({
+  isMultiple: Ember.computed.equal("poll.type", "multiple"),
+  isNumber: Ember.computed.equal("poll.type", "number"),
+  isRandom : Ember.computed.equal("poll.order", "random"),
+  isClosed: Ember.computed.equal("poll.status", "closed"),
 
   // shows the results when
   //   - poll is closed
diff --git a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6 b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
index 5cbb4152bbd..3b262630822 100644
--- a/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/extend-for-poll.js.es6
@@ -20,7 +20,7 @@ export default {
 
     // listen for back-end to tell us when a post has a poll
     messageBus.subscribe("/polls", data => {
-      const post = container.lookup("controller:topic").get('modee.postStream').findLoadedPost(data.post_id);
+      const post = container.lookup("controller:topic").get('model.postStream').findLoadedPost(data.post_id);
       // HACK to trigger the "postViewUpdated" event
       Em.run.next(_ => post.set("cooked", post.get("cooked") + " "));
     });