diff --git a/framework/core/ember/app/components/discussions/stream-item.js b/framework/core/ember/app/components/discussions/stream-item.js
index 919f3f872..6ad077932 100644
--- a/framework/core/ember/app/components/discussions/stream-item.js
+++ b/framework/core/ember/app/components/discussions/stream-item.js
@@ -118,7 +118,7 @@ export default Ember.Component.extend({
         // Tell the controller that we want to load the range of posts that this
 		// gap represents. We also specify which direction we want to load the
 		// posts from.
-		this.get('controller').send(
+		this.sendAction(
 			'loadRange',
 			this.get('start') + (relativeIndex || 0),
 			this.get('end'),
diff --git a/framework/core/ember/app/controllers/discussion.js b/framework/core/ember/app/controllers/discussion.js
index 79dc86e27..2558c1864 100644
--- a/framework/core/ember/app/controllers/discussion.js
+++ b/framework/core/ember/app/controllers/discussion.js
@@ -1,6 +1,6 @@
 import Ember from 'ember';
 
-import PostStream from '../models/post-stream';
+import Stream from '../models/stream';
 
 export default Ember.ObjectController.extend(Ember.Evented, {
 
@@ -11,7 +11,7 @@ export default Ember.ObjectController.extend(Ember.Evented, {
     searchQuery: '',
 
     loaded: false,
-    postStream: null,
+    stream: null,
 
     setup: function(discussion) {
         this.set('model', discussion);
@@ -19,10 +19,10 @@ export default Ember.ObjectController.extend(Ember.Evented, {
         // Set up the post stream object. It needs to know about the discussion
         // its representing the posts for, and we also need to inject the Ember
         // data store.
-        var postStream = PostStream.create();
-        postStream.set('discussion', discussion);
-        postStream.set('store', this.get('store'));
-        this.set('postStream', postStream);
+        var stream = Stream.create();
+        stream.set('discussion', discussion);
+        stream.set('store', this.get('store'));
+        this.set('stream', stream);
 
         // Next, we need to load a list of the discussion's post IDs into the
         // post stream object. If we don't already have this information, we'll
@@ -33,7 +33,7 @@ export default Ember.ObjectController.extend(Ember.Evented, {
         // them. Then we're ready to load some posts!
         var controller = this;
         promise.then(function(discussion) {
-            postStream.setup(discussion.get('postIds'));
+            stream.setup(discussion.get('postIds'));
             controller.set('loaded', true);
             controller.send('jumpToNumber', controller.get('start'));
         });
@@ -71,7 +71,7 @@ export default Ember.ObjectController.extend(Ember.Evented, {
             // position are loaded. We will tell our listeners when they are.
             // Again, the view will scroll down to the appropriate post.
             var controller = this;
-            this.get('postStream').loadNearNumber(number).then(function() {
+            this.get('stream').loadNearNumber(number).then(function() {
                 Ember.run.scheduleOnce('afterRender', function() {
                     controller.trigger('loadedNumber', number);
                 });
@@ -89,7 +89,7 @@ export default Ember.ObjectController.extend(Ember.Evented, {
             // loaded. We will tell our listeners when they are. Again, the view
             // will scroll down to the appropriate post.
             var controller = this;
-            this.get('postStream').loadNearIndex(index).then(function() {
+            this.get('stream').loadNearIndex(index).then(function() {
                 Ember.run.scheduleOnce('afterRender', function() {
                     controller.trigger('loadedIndex', index);
                 });
@@ -97,7 +97,7 @@ export default Ember.ObjectController.extend(Ember.Evented, {
         },
 
         loadRange: function(start, end, backwards) {
-            this.get('postStream').loadRange(start, end, backwards);
+            this.get('stream').loadRange(start, end, backwards);
         }
     }
 });
diff --git a/framework/core/ember/app/models/result-stream.js b/framework/core/ember/app/models/result-stream.js
deleted file mode 100644
index 7555f1d77..000000000
--- a/framework/core/ember/app/models/result-stream.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import Ember from 'ember';
-
-// Represents a collection of results (e.g. a list of discussions)
-
-export default Ember.Object.extend({
-	
-	// An array of the results.
-	results: Em.A(),
-
-	// The currently-active result.
-	currentResult: null,
-
-	sort: null,
-
-	// The index of the currently-active result (determined by ID.) Returns '?'
-	// if the currently-active result is not in the results list.
-	index: function() {
-		var index = '?';
-		var id = this.get('currentResult.id');
-		this.get('results').some(function(result, i) {
-			if (result.get('id') == id) {
-				index = i + 1;
-				return true;
-			}
-		});
-		return index;
-	}.property('currentResult', 'results'),
-	
-	// The number of results.
-	count: function() {
-		return this.get('results.length');
-	}.property('results'),
-
-	// The previous result.
-	previous: function() {
-		return this.get('results').objectAt(this.get('index') - 2);
-	}.property('index'),
-
-	// The next result.
-	next: function() {
-		return this.get('results').objectAt(this.get('index'));
-	}.property('index'),
-
-});
diff --git a/framework/core/ember/app/models/post-stream.js b/framework/core/ember/app/models/stream.js
similarity index 100%
rename from framework/core/ember/app/models/post-stream.js
rename to framework/core/ember/app/models/stream.js
diff --git a/framework/core/ember/app/templates/loading.hbs b/framework/core/ember/app/templates/loading.hbs
index 646f8bae4..06d328b54 100644
--- a/framework/core/ember/app/templates/loading.hbs
+++ b/framework/core/ember/app/templates/loading.hbs
@@ -1 +1 @@
-{{loading-indicator size="large"}}
+{{ui/controls/loading-indicator size="large"}}