diff --git a/ui-v2/app/components/modal-dialog.js b/ui-v2/app/components/modal-dialog.js
index 787f996ae..f34c78a09 100644
--- a/ui-v2/app/components/modal-dialog.js
+++ b/ui-v2/app/components/modal-dialog.js
@@ -1,11 +1,11 @@
 import { get, set } from '@ember/object';
 import { inject as service } from '@ember/service';
-import Component from 'consul-ui/components/dom-buffer';
+import DomBufferComponent from 'consul-ui/components/dom-buffer';
 import SlotsMixin from 'block-slots';
 import WithResizing from 'consul-ui/mixins/with-resizing';
 
 import templatize from 'consul-ui/utils/templatize';
-export default Component.extend(SlotsMixin, WithResizing, {
+export default DomBufferComponent.extend(SlotsMixin, WithResizing, {
   dom: service('dom'),
   checked: true,
   height: null,
diff --git a/ui-v2/app/components/modal-layer.js b/ui-v2/app/components/modal-layer.js
index 66e760e56..74a2887c3 100644
--- a/ui-v2/app/components/modal-layer.js
+++ b/ui-v2/app/components/modal-layer.js
@@ -1,8 +1,8 @@
-import Component from 'consul-ui/components/dom-buffer-flush';
+import DomBufferFlushComponent from 'consul-ui/components/dom-buffer-flush';
 import { inject as service } from '@ember/service';
 import { get } from '@ember/object';
 
-export default Component.extend({
+export default DomBufferFlushComponent.extend({
   dom: service('dom'),
   actions: {
     change: function(e) {
diff --git a/ui-v2/app/components/tabular-collection.js b/ui-v2/app/components/tabular-collection.js
index 370570334..fd331aa86 100644
--- a/ui-v2/app/components/tabular-collection.js
+++ b/ui-v2/app/components/tabular-collection.js
@@ -1,4 +1,4 @@
-import Component from 'ember-collection/components/ember-collection';
+import CollectionComponent from 'ember-collection/components/ember-collection';
 import needsRevalidate from 'ember-collection/utils/needs-revalidate';
 import identity from 'ember-collection/utils/identity';
 import Grid from 'ember-collection/layouts/grid';
@@ -108,7 +108,7 @@ const change = function(e) {
     }
   }
 };
-export default Component.extend(SlotsMixin, WithResizing, {
+export default CollectionComponent.extend(SlotsMixin, WithResizing, {
   tagName: 'table',
   classNames: ['dom-recycling'],
   attributeBindings: ['style'],
diff --git a/ui-v2/app/utils/form/builder.js b/ui-v2/app/utils/form/builder.js
index b7a8e8c5f..2047f0e35 100644
--- a/ui-v2/app/utils/form/builder.js
+++ b/ui-v2/app/utils/form/builder.js
@@ -14,7 +14,7 @@ const defaultChangeset = function(data, validators) {
   return changeset;
 };
 /**
- * Form builder/Form factory (WIP)
+ * Form builder/Form factory
  * Deals with handling (generally change) events and updating data in response to the change
  * in a typical data down event up manner
  * validations are included currently using ember-changeset-validations
diff --git a/ui-v2/ember-cli-build.js b/ui-v2/ember-cli-build.js
index 3ec093557..ce6d212f6 100644
--- a/ui-v2/ember-cli-build.js
+++ b/ui-v2/ember-cli-build.js
@@ -5,7 +5,7 @@ module.exports = function(defaults) {
   const env = EmberApp.env();
   const prodlike = ['production', 'staging'];
   const isProd = env === 'production';
-  // leave this in for now for when I start a proper staging env
+  // if we ever need a 'prodlike' staging environment with staging settings
   // const isProdLike = prodlike.indexOf(env) > -1;
   const sourcemaps = !isProd;
   let app = new EmberApp(