diff --git a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
index cf041eafba..6d894ff941 100644
--- a/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
+++ b/unpublishedScripts/DomainContent/Home/growingPlant/wrapper.js
@@ -94,7 +94,6 @@ Plant = function(spawnPosition, spawnRotation) {
     compoundShapeURL: WATER_CAN_COLLIISION_HULL_URL,
     position: waterCanPosition,
     collisionSoundURL: "atp:/growingPlant/watering_can_drop.L.wav",
-    angularDamping: 1,
     dynamic: true,
     gravity: {
       x: 0.0,
@@ -155,6 +154,7 @@ Plant = function(spawnPosition, spawnRotation) {
       green: 10,
       blue: 200
     },
+    collisionless: true,
     position: waterSpoutPosition,
     rotation: waterSpoutRotation,
     parentID: waterCan,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json
index eb603dde7b..b86085c461 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/lowerBookShelf.json
@@ -1,6 +1,7 @@
 {
     "Entities": [{
         "created": "2016-03-07T21:07:29Z",
+        "name": "home_model_lowerBookShelf",
         "dimensions": {
             "x": 2.0069153308868408,
             "y": 0.0160951167345047,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json
index 25aa606a50..a6e5a13a9d 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersCell.json
@@ -12,7 +12,7 @@
             "z": 0.14119282364845276
         },
         "id": "{fb17c832-d450-4293-a9b5-5b2d0425e8fc}",
-        "name": "Poster-Nail",
+        "name": "home_model_posterNail",
         "position" : {
             "x": -0.05,
             "y": 0.4,
@@ -44,7 +44,7 @@
         "dynamic": 0,
         "id": "{9eec1faa-9e1a-4d76-abeb-a1b1175a44d5}",
         "modelURL": "atp:/kineticObjects/posters/Cellscience-Poster-2.fbx",
-        "name": "hifi-home-poster-cell",
+        "name": "home_model_posterCell",
         "queryAACube": {
             "scale": 1.4568163156509399,
             "x": 1103.1385498046875,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json
index 37a2b90e8f..ce2b619752 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/postersPlaya.json
@@ -9,7 +9,7 @@
             "z": 0.92656642198562622
         },
         "dynamic": 0,
-        "name": "hifi-home-poster-playa",
+        "name": "home_model_posterPlaya",
         "id": "{2b5ca0a0-9115-4916-bee6-63f88d3909b1}",
         "modelURL": "atp:/kineticObjects/posters/Playa-Poster.fbx",
         "queryAACube": {
@@ -41,7 +41,7 @@
             "z": 0.14119282364845276
         },
         "id": "{7f060027-2927-4513-bd92-13a98e6fc06c}",
-        "name": "Poster-Nail",
+        "name": "home_model_posterNail",
         "position": {
             "x": -0.07,
             "y": 0.5,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json
index 3dea13a6d2..6cb640e949 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/trashcan.json
@@ -3,7 +3,7 @@
         "collisionsWillMove": 1,
         "compoundShapeURL": "atp:/kineticObjects/trashcan/Trash-Can-4.obj",
         "created": "2016-03-15T23:06:41Z",
-        "name": "hifi-home-model-trashcan",
+        "name": "home_model_Trashcan",
         "dimensions": {
             "x": 0.4264354407787323,
             "y": 0.50489801168441772,
diff --git a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json
index 344a57e581..0913ea8e73 100644
--- a/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json
+++ b/unpublishedScripts/DomainContent/Home/kineticObjects/upperBookShelf.json
@@ -1,6 +1,7 @@
 {
     "Entities": [{
         "created": "2016-03-15T21:26:11Z",
+        "name": "home_model_upperBookShelf",
         "dimensions": {
             "x": 2.0069153308868408,
             "y": 0.0160951167345047,