From e6379fcaa868e3bd012c926cbd2709de353d3c60 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Tue, 26 Jan 2016 12:57:41 -0800
Subject: [PATCH] Naming changes

---
 examples/junkyard/junkyardClientReset.js        | 4 ++--
 examples/junkyard/junkyardResetEntitySpawner.js | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/examples/junkyard/junkyardClientReset.js b/examples/junkyard/junkyardClientReset.js
index 8aea8470dd..c4dfa19c4f 100644
--- a/examples/junkyard/junkyardClientReset.js
+++ b/examples/junkyard/junkyardClientReset.js
@@ -22,10 +22,10 @@ function reset() {
   for (i = 0; i < e.length; i++) {
     Entities.deleteEntity(e[i]);
   }
-  importArf();
+  importAssetResourceFile();
 }
 
-function importArf() {
+function importAssetResourceFile() {
   Clipboard.importEntities(IMPORT_URL);
   Clipboard.pasteEntities(PASTE_ENTITIES_LOCATION);
 }
\ No newline at end of file
diff --git a/examples/junkyard/junkyardResetEntitySpawner.js b/examples/junkyard/junkyardResetEntitySpawner.js
index b2627c7cd9..f467e0e22f 100644
--- a/examples/junkyard/junkyardResetEntitySpawner.js
+++ b/examples/junkyard/junkyardResetEntitySpawner.js
@@ -19,12 +19,13 @@
   var center = Vec3.sum(MyAvatar.position, Vec3.multiply(3, Quat.getFront(orientation)));
 
 
-  var scriptURL = Script.resolvePath("junkyardResetEntityScript.js?v1" + Math.random());
+  var SCRIPT_URL = Script.resolvePath("junkyardResetEntityScript.js");
+  var MODEL_URL = "http://hifi-content.s3.amazonaws.com/caitlyn/dev/Blueprint%20Objects/Asylum/Asylum_Table/Asylum_Table.fbx";
   var resetEntity = Entities.addEntity({
       type: "Model",
-      modelURL: "http://hifi-content.s3.amazonaws.com/caitlyn/dev/Blueprint%20Objects/Asylum/Asylum_Table/Asylum_Table.fbx",
+      modelURL: MODEL_URL,
       position: center,
-      script: scriptURL,
+      script: SCRIPT_URL,
       dimensions: {
           x: 2.8,
           y: 1.76,