diff --git a/.watchmanconfig b/.watchmanconfig
index 061cb32f1..e58716b58 100644
--- a/.watchmanconfig
+++ b/.watchmanconfig
@@ -1,4 +1,4 @@
 {
-  "ignore_dirs": ["tmp"]
+  "ignore_dirs": ["tmp"],
   "fsevents_latency": 0.1
 }
diff --git a/app/mixins/edit-labels.js b/app/mixins/edit-labels.js
index 09441ed87..72b71470f 100644
--- a/app/mixins/edit-labels.js
+++ b/app/mixins/edit-labels.js
@@ -15,6 +15,11 @@ export default Ember.Mixin.create({
     },
 
     addSystemLabel: function(key, value, type) {
+      if ( !key )
+      {
+        key = C.LABEL.SCHED_HOST_LABEL;
+      }
+
       if ( !type )
       {
         type = ((key||'').indexOf(C.LABEL.SCHED_AFFINITY) === 0 ? 'affinity' : 'system');
diff --git a/app/utils/constants.js b/app/utils/constants.js
index 8c19849ce..b934c9a54 100644
--- a/app/utils/constants.js
+++ b/app/utils/constants.js
@@ -70,8 +70,8 @@ var C = {
 
   LABEL: {
     SYSTEM_PREFIX: 'io.rancher.',
-    SERVICE_NAME: 'io.rancher.project_service.name',
-    PROJECT_NAME: 'io.rancher.project.name',
+    SERVICE_NAME: 'io.rancher.stack_service.name',
+    PROJECT_NAME: 'io.rancher.stack.name',
     SCHED_GLOBAL: 'io.rancher.scheduler.global',
     SCHED_AFFINITY: 'io.rancher.scheduler.affinity:',
     SCHED_CONTAINER: 'io.rancher.scheduler.affinity:container',