diff --git a/script-archive/FlockOfbirds.js b/script-archive/FlockOfbirds.js
index f466fa2909..c2fb54f0a6 100644
--- a/script-archive/FlockOfbirds.js
+++ b/script-archive/FlockOfbirds.js
@@ -3,8 +3,8 @@
 //  examples
 //
 //  Copyright 2014 High Fidelity, Inc.
-//  Creates a flock of birds that fly around and chirp, staying inside the corners of the box defined  
-//  at the start of the script. 
+//  Creates a flock of birds that fly around and chirp, staying inside the corners of the box defined
+//  at the start of the script.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -13,12 +13,12 @@
 //  The rectangular area in the domain where the flock will fly
 var lowerCorner = { x: 0, y: 0, z: 0 };
 var upperCorner = { x: 30, y: 10, z: 30  };
-var STARTING_FRACTION = 0.25;   
+var STARTING_FRACTION = 0.25;
 
 var NUM_BIRDS = 50;
 var UPDATE_INTERVAL = 0.016;
-var playSounds = true; 
-var SOUND_PROBABILITY = 0.001;  
+var playSounds = true;
+var SOUND_PROBABILITY = 0.001;
 var STARTING_LIFETIME = (1.0 / SOUND_PROBABILITY) * UPDATE_INTERVAL * 10;
 var numPlaying = 0;
 var BIRD_SIZE = 0.08;
@@ -36,17 +36,17 @@ var ALIGNMENT_FORCE = 1.5;
 var COHESION_FORCE = 1.0;
 var MAX_COHESION_VELOCITY = 0.5;
 
-var followBirds = false; 
+var followBirds = false;
 var AVATAR_FOLLOW_RATE = 0.001;
 var AVATAR_FOLLOW_VELOCITY_TIMESCALE = 2.0;
 var AVATAR_FOLLOW_ORIENTATION_RATE = 0.005;
-var floor = false; 
+var floor = false;
 var MAKE_FLOOR = false;
 
 var averageVelocity = { x: 0, y: 0, z: 0 };
 var averagePosition = { x: 0, y: 0, z: 0 };
 
-var birdsLoaded = false; 
+var birdsLoaded = false;
 
 var oldAvatarOrientation;
 var oldAvatarPosition;
@@ -79,10 +79,10 @@ function updateBirds(deltaTime) {
                 birds[i].entityId = false;
                 return;
             }
-            //  Sum up average position and velocity 
+            //  Sum up average position and velocity
             if (Vec3.length(properties.velocity) > MIN_ALIGNMENT_VELOCITY) {
                 sumVelocity = Vec3.sum(sumVelocity, properties.velocity);
-                birdVelocitiesCounted += 1;  
+                birdVelocitiesCounted += 1;
             }
             sumPosition = Vec3.sum(sumPosition, properties.position);
             birdPositionsCounted += 1;
@@ -93,10 +93,10 @@ function updateBirds(deltaTime) {
                 var randomVelocity = randomVector(RANDOM_FLAP_VELOCITY);
                 randomVelocity.y = FLAP_UP + Math.random() * FLAP_UP;
 
-                //  Alignment Velocity 
-                var alignmentVelocityMagnitude = Math.min(MAX_ALIGNMENT_VELOCITY, Vec3.length(Vec3.multiply(ALIGNMENT_FORCE, averageVelocity))); 
+                //  Alignment Velocity
+                var alignmentVelocityMagnitude = Math.min(MAX_ALIGNMENT_VELOCITY, Vec3.length(Vec3.multiply(ALIGNMENT_FORCE, averageVelocity)));
                 var alignmentVelocity = Vec3.multiply(alignmentVelocityMagnitude, Vec3.normalize(averageVelocity));
-                alignmentVelocity.y *= VERTICAL_ALIGNMENT_COUPLING; 
+                alignmentVelocity.y *= VERTICAL_ALIGNMENT_COUPLING;
 
                 //  Cohesion
                 var distanceFromCenter = Vec3.length(Vec3.subtract(averagePosition, properties.position));
@@ -107,10 +107,10 @@ function updateBirds(deltaTime) {
 
                 Entities.editEntity(birds[i].entityId, { velocity: Vec3.sum(properties.velocity, newVelocity) });
 
-            } 
+            }
 
             //  Check whether to play a chirp
-            if (playSounds && (!birds[i].audioId || !birds[i].audioId.isPlaying) && (Math.random() < ((numPlaying > 0) ? SOUND_PROBABILITY / numPlaying : SOUND_PROBABILITY))) {
+            if (playSounds && (!birds[i].audioId || !birds[i].audioId.playing) && (Math.random() < ((numPlaying > 0) ? SOUND_PROBABILITY / numPlaying : SOUND_PROBABILITY))) {
                 var options = {
                           position: properties.position,
                     volume: BIRD_MASTER_VOLUME
@@ -126,43 +126,43 @@ function updateBirds(deltaTime) {
                 // Change size, and update lifetime to keep bird alive
                 Entities.editEntity(birds[i].entityId, { dimensions: Vec3.multiply(1.5, properties.dimensions),
                                                          lifetime: properties.ageInSeconds + STARTING_LIFETIME});
-                
+
             } else if (birds[i].audioId) {
-                // If bird is playing a chirp 
-                if (!birds[i].audioId.isPlaying) {
+                // If bird is playing a chirp
+                if (!birds[i].audioId.playing) {
                     Entities.editEntity(birds[i].entityId, { dimensions: { x: BIRD_SIZE, y: BIRD_SIZE, z: BIRD_SIZE }});
                     numPlaying--;
-                } 
+                }
             }
 
             //  Keep birds in their 'cage'
             var bounce = false;
-            var newVelocity = properties.velocity;  
-            var newPosition = properties.position; 
+            var newVelocity = properties.velocity;
+            var newPosition = properties.position;
             if (properties.position.x < lowerCorner.x) {
-                newPosition.x = lowerCorner.x; 
+                newPosition.x = lowerCorner.x;
                 newVelocity.x *= -1.0;
                 bounce = true;
             } else if (properties.position.x > upperCorner.x) {
-                newPosition.x = upperCorner.x; 
+                newPosition.x = upperCorner.x;
                 newVelocity.x *= -1.0;
                 bounce = true;
             }
             if (properties.position.y < lowerCorner.y) {
-                newPosition.y = lowerCorner.y; 
+                newPosition.y = lowerCorner.y;
                 newVelocity.y *= -1.0;
                 bounce = true;
             } else if (properties.position.y > upperCorner.y) {
-                newPosition.y = upperCorner.y; 
+                newPosition.y = upperCorner.y;
                 newVelocity.y *= -1.0;
                 bounce = true;
-            } 
+            }
             if (properties.position.z < lowerCorner.z) {
-                newPosition.z = lowerCorner.z; 
+                newPosition.z = lowerCorner.z;
                 newVelocity.z *= -1.0;
                 bounce = true;
             } else if (properties.position.z > upperCorner.z) {
-                newPosition.z = upperCorner.z; 
+                newPosition.z = upperCorner.z;
                 newVelocity.z *= -1.0;
                 bounce = true;
             }
@@ -171,7 +171,7 @@ function updateBirds(deltaTime) {
             }
         }
     }
-    //  Update average velocity and position of flock 
+    //  Update average velocity and position of flock
     if (birdVelocitiesCounted > 0) {
         averageVelocity = Vec3.multiply(1.0 / birdVelocitiesCounted, sumVelocity);
         //print(Vec3.length(averageVelocity));
@@ -184,10 +184,10 @@ function updateBirds(deltaTime) {
                 MyAvatar.orientation = Quat.mix(MyAvatar.orientation, birdDirection, AVATAR_FOLLOW_ORIENTATION_RATE);
             }
         }
-    } 
+    }
     if (birdPositionsCounted > 0) {
         averagePosition = Vec3.multiply(1.0 / birdPositionsCounted, sumPosition);
-            //  If Following birds, update position 
+            //  If Following birds, update position
         if (followBirds) {
             MyAvatar.position = Vec3.sum(Vec3.multiply(AVATAR_FOLLOW_RATE, MyAvatar.position), Vec3.multiply(1.0 - AVATAR_FOLLOW_RATE, averagePosition));
         }
@@ -211,12 +211,12 @@ Script.scriptEnding.connect(function() {
 });
 
 function loadBirds(howMany) {
-    oldAvatarOrientation = MyAvatar.orientation; 
+    oldAvatarOrientation = MyAvatar.orientation;
     oldAvatarPosition = MyAvatar.position;
 
   var sound_filenames = ["bushtit_1.raw", "bushtit_2.raw", "bushtit_3.raw"];
   /* Here are more sounds/species you can use
-                        , "mexicanWhipoorwill.raw", 
+                        , "mexicanWhipoorwill.raw",
                            "rosyfacedlovebird.raw", "saysphoebe.raw", "westernscreechowl.raw", "bandtailedpigeon.wav", "bridledtitmouse.wav",
                            "browncrestedflycatcher.wav", "commonnighthawk.wav", "commonpoorwill.wav", "doublecrestedcormorant.wav",
                            "gambelsquail.wav", "goldcrownedkinglet.wav", "greaterroadrunner.wav","groovebilledani.wav","hairywoodpecker.wav",
@@ -252,19 +252,19 @@ function loadBirds(howMany) {
             { red: 216, green: 153, blue: 99 },
             { red: 242, green: 226, blue: 64 }
   ];
-  
+
   var SOUND_BASE_URL = "http://public.highfidelity.io/sounds/Animals/";
-  
+
   for (var i = 0; i < howMany; i++) {
     var whichBird = Math.floor(Math.random() * sound_filenames.length);
-    var position = { 
-        x: lowerCorner.x + (upperCorner.x - lowerCorner.x) / 2.0 + (Math.random() - 0.5) * (upperCorner.x - lowerCorner.x) * STARTING_FRACTION, 
-        y: lowerCorner.y + (upperCorner.y - lowerCorner.y) / 2.0 + (Math.random() - 0.5) * (upperCorner.y - lowerCorner.y) * STARTING_FRACTION, 
+    var position = {
+        x: lowerCorner.x + (upperCorner.x - lowerCorner.x) / 2.0 + (Math.random() - 0.5) * (upperCorner.x - lowerCorner.x) * STARTING_FRACTION,
+        y: lowerCorner.y + (upperCorner.y - lowerCorner.y) / 2.0 + (Math.random() - 0.5) * (upperCorner.y - lowerCorner.y) * STARTING_FRACTION,
         z: lowerCorner.z + (upperCorner.z - lowerCorner.x) / 2.0 + (Math.random() - 0.5) * (upperCorner.z - lowerCorner.z) * STARTING_FRACTION
-    }; 
+    };
 
     birds.push({
-        sound: SoundCache.getSound(SOUND_BASE_URL + sound_filenames[whichBird]), 
+        sound: SoundCache.getSound(SOUND_BASE_URL + sound_filenames[whichBird]),
         entityId: Entities.addEntity({
                     type: "Sphere",
                     position: position,
@@ -282,8 +282,8 @@ function loadBirds(howMany) {
     }
     if (MAKE_FLOOR) {
         var FLOOR_THICKNESS = 0.05;
-        floor = Entities.addEntity({ type: "Box", position: {   x: lowerCorner.x + (upperCorner.x - lowerCorner.x) / 2.0, 
-                                                                y: lowerCorner.y, 
+        floor = Entities.addEntity({ type: "Box", position: {   x: lowerCorner.x + (upperCorner.x - lowerCorner.x) / 2.0,
+                                                                y: lowerCorner.y,
                                                                 z: lowerCorner.z + (upperCorner.z - lowerCorner.z) / 2.0  },
                                                    dimensions: { x: (upperCorner.x - lowerCorner.x), y: FLOOR_THICKNESS, z: (upperCorner.z - lowerCorner.z)},
                                                    color: {red: 100, green: 100, blue: 100}
diff --git a/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js b/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js
index 381a7ee902..30567b4fc7 100644
--- a/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js
+++ b/script-archive/audioExamples/acAudioSearching/ACAudioSearchAndInject.js
@@ -49,7 +49,7 @@ function debug() { // Display the arguments not just [Object object].
 EntityViewer.setCenterRadius(QUERY_RADIUS);
 
 // ENTITY DATA CACHE
-// 
+//
 var entityCache = {}; // A dictionary of unexpired EntityData objects.
 var examinationCount = 0;
 function EntityDatum(entityIdentifier) { // Just the data of an entity that we need to know about.
@@ -146,7 +146,7 @@ function EntityDatum(entityIdentifier) { // Just the data of an entity that we n
             return;
         }
         that.injector.setOptions(options);                                   // PLAYING => UPDATE POSITION ETC
-        if (!that.injector.isPlaying) { // Subtle: a looping sound will not check playbackGap.
+        if (!that.injector.playing) { // Subtle: a looping sound will not check playbackGap.
             if (repeat()) {                                                  // WAITING => PLAYING
                 // Setup next play just once, now. Changes won't be looked at while we wait.
                 that.playAfter = randomizedNextPlay();
@@ -208,7 +208,7 @@ function updateAllEntityData() { // A fast update of all entities we know about.
             stats.entities++;
             if (datum.url) {
                 stats.sounds++;
-                if (datum.injector && datum.injector.isPlaying) {
+                if (datum.injector && datum.injector.playing) {
                     stats.playing++;
                 }
             }
diff --git a/script-archive/avatarSelector.js b/script-archive/avatarSelector.js
index dc2916a1a8..47740ef0b3 100644
--- a/script-archive/avatarSelector.js
+++ b/script-archive/avatarSelector.js
@@ -283,7 +283,7 @@ function actionStartEvent(event) {
                 if (avatarIndex < avatars.length) {
                     var actionPlace = avatars[avatarIndex];
 
-                    print("Changing avatar to " + actionPlace.name 
+                    print("Changing avatar to " + actionPlace.name
                       + " after click on panel " + panelIndex + " with avatar index " + avatarIndex);
 
                     MyAvatar.useFullAvatarURL(actionPlace.content_url);
@@ -395,7 +395,7 @@ function update(deltaTime) {
         Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
 
         // if the reticle is up then we may need to play the next muzak
-        if (currentMuzakInjector && !currentMuzakInjector.isPlaying) {
+        if (currentMuzakInjector && !currentMuzakInjector.playing) {
             playNextMuzak();
         }
     }
diff --git a/script-archive/baseball/baseballCrowd.js b/script-archive/baseball/baseballCrowd.js
index de9b53f9ec..1459ce6e67 100644
--- a/script-archive/baseball/baseballCrowd.js
+++ b/script-archive/baseball/baseballCrowd.js
@@ -21,7 +21,7 @@ var CHATTER_VOLUME = 0.20
 var EXTRA_VOLUME = 0.25
 
 function playChatter() {
-    if (chatter.downloaded && !chatter.isPlaying) {
+    if (chatter.downloaded && !chatter.playing) {
         Audio.playSound(chatter, { loop: true, volume: CHATTER_VOLUME });
     }
 }
@@ -31,7 +31,7 @@ chatter.ready.connect(playChatter);
 var currentInjector = null;
 
 function playRandomExtras() {
-    if ((!currentInjector || !currentInjector.isPlaying) && (Math.random() < (1.0 / 1800.0))) {
+    if ((!currentInjector || !currentInjector.playing) && (Math.random() < (1.0 / 1800.0))) {
         // play a random extra sound about every 30s
         currentInjector = Audio.playSound(
             extras[Math.floor(Math.random() * extras.length)],
diff --git a/script-archive/controllers/hydra/airGuitar.js b/script-archive/controllers/hydra/airGuitar.js
index f8606808c1..73c7099eed 100644
--- a/script-archive/controllers/hydra/airGuitar.js
+++ b/script-archive/controllers/hydra/airGuitar.js
@@ -22,12 +22,12 @@ function printVector(v) {
     return;
 }
 
-function vMinus(a, b) { 
+function vMinus(a, b) {
     var rval = { x: a.x - b.x, y: a.y - b.y, z: a.z - b.z };
     return rval;
 }
 
-//  The model file to be used for the guitar 
+//  The model file to be used for the guitar
 var guitarModel = HIFI_PUBLIC_BUCKET + "models/attachments/guitar.fst";
 
 //  Load sounds that will be played
@@ -47,7 +47,7 @@ chords[6] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Me
 chords[7] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+E+short.raw");
 chords[8] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Metal+G+short.raw");
 
-//  Steel Guitar 
+//  Steel Guitar
 chords[9] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+A.raw");
 chords[10] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+B.raw");
 chords[11] = SoundCache.getSound(HIFI_PUBLIC_BUCKET + "sounds/Guitars/Guitar+-+Steel+E.raw");
@@ -83,8 +83,8 @@ if (leftHanded) {
 }
 
 var lastPosition = { x: 0.0,
-                 y: 0.0, 
-                 z: 0.0 }; 
+                 y: 0.0,
+                 z: 0.0 };
 
 var audioInjector = null;
 var selectorPressed = false;
@@ -106,7 +106,7 @@ function checkHands(deltaTime) {
     var chord = Controller.getValue(chordTrigger);
 
     if (volume > 1.0) volume = 1.0;
-    if ((chord > 0.1) && audioInjector && audioInjector.isPlaying) {
+    if ((chord > 0.1) && audioInjector && audioInjector.playing) {
         // If chord finger trigger pulled, stop current chord
         print("stopping chord because cord trigger pulled");
         audioInjector.stop();
@@ -119,7 +119,7 @@ function checkHands(deltaTime) {
             guitarSelector += NUM_CHORDS;
             if (guitarSelector >= NUM_CHORDS * NUM_GUITARS) {
                 guitarSelector = 0;
-            } 
+            }
             print("new guitarBase: " + guitarSelector);
             stopAudio(true);
             selectorPressed = true;
@@ -160,7 +160,7 @@ function checkHands(deltaTime) {
 }
 
 function stopAudio(killInjector) {
-    if (audioInjector && audioInjector.isPlaying) {
+    if (audioInjector && audioInjector.playing) {
         print("stopped sound");
         audioInjector.stop();
     }
@@ -212,4 +212,3 @@ function scriptEnding() {
 Script.update.connect(checkHands);
 Script.scriptEnding.connect(scriptEnding);
 Controller.keyPressEvent.connect(keyPressEvent);
-
diff --git a/script-archive/drylake/ratCreator.js b/script-archive/drylake/ratCreator.js
index 60ccf1a1a3..6f6b322f84 100644
--- a/script-archive/drylake/ratCreator.js
+++ b/script-archive/drylake/ratCreator.js
@@ -340,7 +340,7 @@ function moveRats() {
         var metaRat = getMetaRatByRat(rat);
         if (metaRat !== undefined) {
             if (metaRat.injector !== undefined) {
-                if (metaRat.injector.isPlaying === true) {
+                if (metaRat.injector.playing === true) {
                     metaRat.injector.options = {
                         loop: true,
                         position: ratPosition
diff --git a/script-archive/entityScripts/movable.js b/script-archive/entityScripts/movable.js
index b7ecfbbc8e..06b30ce15e 100644
--- a/script-archive/entityScripts/movable.js
+++ b/script-archive/entityScripts/movable.js
@@ -8,7 +8,7 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-(function(){ 
+(function(){
 
     this.entityID = null;
     this.properties = null;
@@ -30,13 +30,13 @@
         "http://public.highfidelity.io/sounds/MovingFurniture/FurnitureMove2.wav",
         "http://public.highfidelity.io/sounds/MovingFurniture/FurnitureMove3.wav"
     ];
-    
+
     this.turnSoundURLS = [
 
         "http://public.highfidelity.io/sounds/MovingFurniture/FurnitureMove1.wav",
         "http://public.highfidelity.io/sounds/MovingFurniture/FurnitureMove2.wav",
         "http://public.highfidelity.io/sounds/MovingFurniture/FurnitureMove3.wav"
-    
+
         // TODO: determine if these or other turn sounds work better than move sounds.
         //"http://public.highfidelity.io/sounds/MovingFurniture/FurnitureTurn1.wav",
         //"http://public.highfidelity.io/sounds/MovingFurniture/FurnitureTurn2.wav",
@@ -50,7 +50,7 @@
     this.turnSound = null;
     this.moveInjector = null;
     this.turnInjector = null;
-    
+
     var debug = false;
     var displayRotateTargets = true; // change to false if you don't want the rotate targets
     var rotateOverlayTargetSize = 10000; // really big target
@@ -61,12 +61,12 @@
     var yawZero;
     var rotationNormal;
     var yawNormal;
-    var stopSoundDelay = 100; // number of msecs of not moving to have sound stop    
-    
+    var stopSoundDelay = 100; // number of msecs of not moving to have sound stop
+
     this.getRandomInt = function(min, max) {
         return Math.floor(Math.random() * (max - min + 1)) + min;
-    }    
-    
+    }
+
     this.downloadSounds = function() {
         for (var i = 0; i < this.moveSoundURLS.length; i++) {
             this.moveSounds[i] = SoundCache.getSound(this.moveSoundURLS[i]);
@@ -95,7 +95,7 @@
             if (debug) {
                 print("playMoveSound() --- calling this.moveInjector = Audio.playSound(this.moveSound...)");
             }
-            
+
             if (!this.moveInjector) {
                 this.moveInjector = Audio.playSound(this.moveSound, { position: this.properties.position, loop: true, volume: 0.1 });
             } else {
@@ -148,7 +148,7 @@
         var upVector = { x: 0, y: 1, z: 0 };
         var intersection = this.rayPlaneIntersection(pickRay.origin, pickRay.direction,
                                                      this.properties.position, upVector);
-                                                     
+
         var newPosition = Vec3.sum(intersection, this.graboffset);
         Entities.editEntity(this.entityID, { position: newPosition });
     };
@@ -158,7 +158,7 @@
         var pickRay = Camera.computePickRay(mouseEvent.x, mouseEvent.y)
         var upVector = { x: 0, y: 1, z: 0 };
         var intersection = this.rayPlaneIntersection(pickRay.origin, pickRay.direction,
-                                                     this.properties.position, upVector);                                 
+                                                     this.properties.position, upVector);
         this.graboffset = Vec3.subtract(this.properties.position, intersection);
     };
 
@@ -183,18 +183,18 @@
             this.lastMovedPosition.y = mouseEvent.y;
         }
     }
-        
+
     this.move = function(mouseEvent) {
         this.updatePosition(mouseEvent);
-        if (this.moveInjector === null || !this.moveInjector.isPlaying) {
+        if (this.moveInjector === null || !this.moveInjector.playing) {
             this.playMoveSound();
         }
     };
-    
+
     this.release = function(mouseEvent) {
         this.updatePosition(mouseEvent);
     };
-    
+
     this.rotate = function(mouseEvent) {
         var pickRay = Camera.computePickRay(mouseEvent.x, mouseEvent.y)
         var result = Overlays.findRayIntersection(pickRay);
@@ -205,7 +205,7 @@
             var centerToZero = Vec3.subtract(center, zero);
             var centerToIntersect = Vec3.subtract(center, result.intersection);
             var angleFromZero = Vec3.orientedAngle(centerToZero, centerToIntersect, rotationNormal);
-            
+
             var distanceFromCenter = Vec3.distance(center, result.intersection);
             var snapToInner = false;
             // var innerRadius = (Vec3.length(selectionManager.worldDimensions) / 2) * 1.1;
@@ -213,10 +213,10 @@
                 angleFromZero = Math.floor(angleFromZero/innerSnapAngle) * innerSnapAngle;
                 snapToInner = true;
             }
-            
+
             var yawChange = Quat.fromVec3Degrees({ x: 0, y: angleFromZero, z: 0 });
             Entities.editEntity(this.entityID, { rotation: Quat.multiply(yawChange, this.originalRotation) });
-            
+
 
             // update the rotation display accordingly...
             var startAtCurrent = 360-angleFromZero;
@@ -245,7 +245,7 @@
             }
         }
 
-        if (this.turnInjector === null || !this.turnInjector.isPlaying) {
+        if (this.turnInjector === null || !this.turnInjector.playing) {
             this.playTurnSound();
         }
     };
@@ -267,7 +267,7 @@
         this.rotateOverlayOuter = null;
         this.rotateOverlayCurrent = null;
     }
-    
+
     this.displayRotateOverlay = function(mouseEvent) {
         var yawOverlayAngles = { x: 90, y: 0, z: 0 };
         var yawOverlayRotation = Quat.fromVec3Degrees(yawOverlayAngles);
@@ -356,14 +356,14 @@
         var pickRay = Camera.computePickRay(mouseEvent.x, mouseEvent.y)
         var result = Overlays.findRayIntersection(pickRay);
         yawZero = result.intersection;
-                
+
     };
-    
+
     this.preload = function(entityID) {
         this.updateProperties(entityID); // All callbacks start by updating the properties
         this.downloadSounds();
     };
-    
+
     this.clickDownOnEntity = function(entityID, mouseEvent) {
         this.updateProperties(entityID); // All callbacks start by updating the properties
         this.grab(mouseEvent);
@@ -372,13 +372,13 @@
         var nowMSecs = nowDate.getTime();
         this.clickedAt = nowMSecs;
         this.firstHolding = true;
-        
+
         this.clicked.x = mouseEvent.x;
         this.clicked.y = mouseEvent.y;
         this.lastMovedPosition.x = mouseEvent.x;
         this.lastMovedPosition.y = mouseEvent.y;
         this.lastMovedMSecs = nowMSecs;
-        
+
         this.pickRandomSounds();
     };
 
@@ -391,7 +391,7 @@
             if (this.clicked.x == mouseEvent.x && this.clicked.y == mouseEvent.y) {
                 var d = new Date();
                 var now = d.getTime();
-        
+
                 if (now - this.clickedAt > 500) {
                     this.displayRotateOverlay(mouseEvent);
                     this.firstHolding = false;
@@ -402,13 +402,13 @@
                 this.firstHolding = false;
             }
         }
-        
+
         if (this.rotateMode) {
             this.rotate(mouseEvent);
         } else {
             this.move(mouseEvent);
         }
-        
+
         this.stopSoundIfNotMoving(mouseEvent);
     };
     this.clickReleaseOnEntity = function(entityID, mouseEvent) {
@@ -418,7 +418,7 @@
         } else {
             this.release(mouseEvent);
         }
-        
+
         if (this.rotateOverlayTarget != null) {
             this.cleanupRotateOverlay();
             this.rotateMode = false;
diff --git a/script-archive/example/audio/birdSongs.js b/script-archive/example/audio/birdSongs.js
index 557fc81f5b..9e949a19ed 100644
--- a/script-archive/example/audio/birdSongs.js
+++ b/script-archive/example/audio/birdSongs.js
@@ -22,7 +22,7 @@ var BIRD_VELOCITY = 2.0;
 var LIGHT_RADIUS = 10.0;
 var BIRD_MASTER_VOLUME = 0.5;
 
-var useLights = true; 
+var useLights = true;
 
 function randomVector(scale) {
     return { x: Math.random() * scale - scale / 2.0, y: Math.random() * scale - scale / 2.0, z: Math.random() * scale - scale / 2.0 };
@@ -33,11 +33,11 @@ function maybePlaySound(deltaTime) {
         //  Set the location and other info for the sound to play
         var whichBird = Math.floor(Math.random() * birds.length);
         //print("playing sound # " + whichBird);
-        var position = { 
-      x: lowerCorner.x + Math.random() * (upperCorner.x - lowerCorner.x), 
-        y: lowerCorner.y + Math.random() * (upperCorner.y - lowerCorner.y), 
-      z: lowerCorner.z + Math.random() * (upperCorner.z - lowerCorner.z) 
-    }; 
+        var position = {
+      x: lowerCorner.x + Math.random() * (upperCorner.x - lowerCorner.x),
+        y: lowerCorner.y + Math.random() * (upperCorner.y - lowerCorner.y),
+      z: lowerCorner.z + Math.random() * (upperCorner.z - lowerCorner.z)
+    };
         var options = {
           position: position,
       volume: BIRD_MASTER_VOLUME
@@ -63,31 +63,31 @@ function maybePlaySound(deltaTime) {
 
                 constantAttenuation: 0,
                 linearAttenuation: 4.0,
-                quadraticAttenuation: 2.0, 
+                quadraticAttenuation: 2.0,
                 lifetime: 10
             });
         }
-    
+
         playing.push({ audioId: Audio.playSound(birds[whichBird].sound, options), entityId: entityId, lightId: lightId, color: birds[whichBird].color });
     }
     if (playing.length != numPlaying) {
         numPlaying = playing.length;
         //print("number playing = " + numPlaying);
-    }     
+    }
     for (var i = 0; i < playing.length; i++) {
-        if (!playing[i].audioId.isPlaying) {
+        if (!playing[i].audioId.playing) {
             Entities.deleteEntity(playing[i].entityId);
             if (useLights) {
                 Entities.deleteEntity(playing[i].lightId);
-            }    
+            }
             playing.splice(i, 1);
         } else {
             var loudness = playing[i].audioId.loudness;
             var newColor = { red: playing[i].color.red, green: playing[i].color.green, blue: playing[i].color.blue };
             if (loudness > 0.05) {
-                newColor.red *= (1.0 - loudness); 
-                newColor.green *= (1.0 - loudness);  
-                newColor.blue *= (1.0 - loudness); 
+                newColor.red *= (1.0 - loudness);
+                newColor.green *= (1.0 - loudness);
+                newColor.blue *= (1.0 - loudness);
             }
             var properties = Entities.getEntityProperties(playing[i].entityId);
             var newPosition = Vec3.sum(properties.position, randomVector(BIRD_VELOCITY * deltaTime));
@@ -120,7 +120,7 @@ Script.scriptEnding.connect(function() {
 });
 
 function loadBirds() {
-  var sound_filenames = ["bushtit_1.raw", "bushtit_2.raw", "bushtit_3.raw", "mexicanWhipoorwill.raw", 
+  var sound_filenames = ["bushtit_1.raw", "bushtit_2.raw", "bushtit_3.raw", "mexicanWhipoorwill.raw",
                            "rosyfacedlovebird.raw", "saysphoebe.raw", "westernscreechowl.raw", "bandtailedpigeon.wav", "bridledtitmouse.wav",
                            "browncrestedflycatcher.wav", "commonnighthawk.wav", "commonpoorwill.wav", "doublecrestedcormorant.wav",
                            "gambelsquail.wav", "goldcrownedkinglet.wav", "greaterroadrunner.wav","groovebilledani.wav","hairywoodpecker.wav",
@@ -155,13 +155,13 @@ function loadBirds() {
             { red: 216, green: 153, blue: 99 },
             { red: 242, green: 226, blue: 64 }
   ];
-  
+
   var SOUND_BASE_URL = "http://public.highfidelity.io/sounds/Animals/";
-  
+
   for (var i = 0; i < sound_filenames.length; i++) {
       birds.push({
-        sound: SoundCache.getSound(SOUND_BASE_URL + sound_filenames[i]), 
-        color: colors[i] 
+        sound: SoundCache.getSound(SOUND_BASE_URL + sound_filenames[i]),
+        color: colors[i]
       });
   }
-}
\ No newline at end of file
+}
diff --git a/script-archive/lobby.js b/script-archive/lobby.js
index 3095740c93..6fa4a42cb6 100644
--- a/script-archive/lobby.js
+++ b/script-archive/lobby.js
@@ -88,19 +88,19 @@ var DRONE_VOLUME = 0.3;
 function drawLobby() {
   if (!panelWall) {
     print("Adding overlays for the lobby panel wall and orb shell.");
-    
+
     var cameraEuler = Quat.safeEulerAngles(Camera.orientation);
     var towardsMe = Quat.angleAxis(cameraEuler.y + 180, { x: 0, y: 1, z: 0});
-    
+
     var orbPosition = Vec3.sum(Camera.position, Vec3.multiplyQbyV(towardsMe, ORB_SHIFT));
-    
+
     var panelWallProps = {
       url: LOBBY_PANEL_WALL_URL,
       position: Vec3.sum(orbPosition, Vec3.multiplyQbyV(towardsMe, panelsCenterShift)),
       rotation: towardsMe,
       dimensions: panelsDimensions
     };
-    
+
     var orbShellProps = {
       url: LOBBY_SHELL_URL,
       position: orbPosition,
@@ -128,13 +128,13 @@ function drawLobby() {
         visible: false,
         isFacingAvatar: true
     };
-    
+
     avatarStickPosition = MyAvatar.position;
 
-    panelWall = Overlays.addOverlay("model", panelWallProps);    
+    panelWall = Overlays.addOverlay("model", panelWallProps);
     orbShell = Overlays.addOverlay("model", orbShellProps);
     descriptionText = Overlays.addOverlay("text3d", descriptionTextProps);
-    
+
     if (droneSound.downloaded) {
       // start the drone sound
       if (!currentDrone) {
@@ -143,7 +143,7 @@ function drawLobby() {
         currentDrone.restart();
       }
     }
-    
+
     // start one of our muzak sounds
     playRandomMuzak();
   }
@@ -157,31 +157,31 @@ function changeLobbyTextures() {
   req.send();
 
   places = JSON.parse(req.responseText).data.places;
-  
+
   var NUM_PANELS = places.length;
 
-  var textureProp = { 
+  var textureProp = {
     textures: {}
   };
-  
+
   for (var j = 0; j < NUM_PANELS; j++) {
     var panelIndex = placeIndexToPanelIndex(j);
     textureProp["textures"]["file" + panelIndex] = places[j].previews.lobby;
   };
-  
+
   Overlays.editOverlay(panelWall, textureProp);
 }
 
 var MUZAK_VOLUME = 0.1;
 
-function playCurrentSound(secondOffset) {  
+function playCurrentSound(secondOffset) {
   if (currentSound == latinSound) {
     if (!latinInjector) {
       latinInjector = Audio.playSound(latinSound, { localOnly: true, secondOffset: secondOffset, volume: MUZAK_VOLUME });
     } else {
       latinInjector.restart();
     }
-    
+
     currentMuzakInjector = latinInjector;
   } else if (currentSound == elevatorSound) {
     if (!elevatorInjector) {
@@ -189,7 +189,7 @@ function playCurrentSound(secondOffset) {
     } else {
       elevatorInjector.restart();
     }
-    
+
     currentMuzakInjector = elevatorInjector;
   }
 }
@@ -205,14 +205,14 @@ function playNextMuzak() {
         currentSound = latinSound;
       }
     }
-    
+
     playCurrentSound(0);
   }
 }
 
 function playRandomMuzak() {
   currentSound = null;
-  
+
   if (latinSound.downloaded && elevatorSound.downloaded) {
     currentSound = Math.random() < 0.5 ? latinSound : elevatorSound;
   } else if (latinSound.downloaded) {
@@ -220,11 +220,11 @@ function playRandomMuzak() {
   } else if (elevatorSound.downloaded) {
     currentSound = elevatorSound;
   }
-  
+
   if (currentSound) {
     // pick a random number of seconds from 0-10 to offset the muzak
     var secondOffset = Math.random() * 10;
-    
+
     playCurrentSound(secondOffset);
   } else {
     currentMuzakInjector = null;
@@ -233,36 +233,36 @@ function playRandomMuzak() {
 
 function cleanupLobby() {
   toggleEnvironmentRendering(true);
-  
+
   // for each of the 21 placeholder textures, set them back to default so the cached model doesn't have changed textures
   var panelTexturesReset = {};
   panelTexturesReset["textures"] = {};
-      
-  for (var j = 0; j < MAX_NUM_PANELS; j++) { 
+
+  for (var j = 0; j < MAX_NUM_PANELS; j++) {
     panelTexturesReset["textures"]["file" + (j + 1)] = LOBBY_BLANK_PANEL_TEXTURE_URL;
   };
-  
+
   Overlays.editOverlay(panelWall, panelTexturesReset);
-  
+
   Overlays.deleteOverlay(panelWall);
   Overlays.deleteOverlay(orbShell);
   Overlays.deleteOverlay(descriptionText);
-  
+
   panelWall = false;
   orbShell = false;
-  
+
   if (currentDrone) {
     currentDrone.stop();
     currentDrone = null
   }
-  
+
   if (currentMuzakInjector) {
     currentMuzakInjector.stop();
     currentMuzakInjector = null;
   }
-  
+
   places = {};
-  
+
 }
 
 function actionStartEvent(event) {
@@ -271,19 +271,19 @@ function actionStartEvent(event) {
     // check if we hit a panel and if we should jump there
     var result = Overlays.findRayIntersection(event.actionRay);
     if (result.intersects && result.overlayID == panelWall) {
-    
+
       var panelName = result.extraInfo;
-      
+
       var panelStringIndex = panelName.indexOf("Panel");
       if (panelStringIndex != -1) {
         var panelIndex = parseInt(panelName.slice(5));
         var placeIndex = panelIndexToPlaceIndex(panelIndex);
         if (placeIndex < places.length) {
           var actionPlace = places[placeIndex];
-          
-          print("Jumping to " + actionPlace.name + " at " + actionPlace.address 
+
+          print("Jumping to " + actionPlace.name + " at " + actionPlace.address
             + " after click on panel " + panelIndex + " with place index " + placeIndex);
-          
+
           Window.location = actionPlace.address;
           maybeCleanupLobby();
         }
@@ -328,7 +328,7 @@ function handleLookAt(pickRay) {
         var placeIndex = panelIndexToPlaceIndex(panelIndex);
         if (placeIndex < places.length) {
           var actionPlace = places[placeIndex];
-          
+
           if (actionPlace.description == "") {
               Overlays.editOverlay(descriptionText, { text: actionPlace.name, visible: showText });
           } else {
@@ -378,7 +378,7 @@ function update(deltaTime) {
     Overlays.editOverlay(descriptionText, { position: textOverlayPosition() });
 
     // if the reticle is up then we may need to play the next muzak
-    if (currentMuzakInjector && !currentMuzakInjector.isPlaying) {
+    if (currentMuzakInjector && !currentMuzakInjector.playing) {
       playNextMuzak();
     }
   }
diff --git a/script-archive/playTestSound.js b/script-archive/playTestSound.js
index 318df6a257..573c8879c4 100644
--- a/script-archive/playTestSound.js
+++ b/script-archive/playTestSound.js
@@ -2,12 +2,12 @@
 //  playTestSound.js
 //  examples
 //
-//  Created by Philip Rosedale 
+//  Created by Philip Rosedale
 //  Copyright 2014 High Fidelity, Inc.
 //
-//  Creates an object in front of you that changes color and plays a light 
-//  at the start of a drum clip that loops.   As you move away it will tell you in the 
-//  log how many meters you are from the source. 
+//  Creates an object in front of you that changes color and plays a light
+//  at the start of a drum clip that loops.   As you move away it will tell you in the
+//  log how many meters you are from the source.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -17,7 +17,7 @@ var sound = SoundCache.getSound("https://s3.amazonaws.com/hifi-public/sounds/Dru
 
 var position = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, z: 0 }), Quat.getFront(MyAvatar.orientation));
 
-var time; 
+var time;
 var soundPlaying = null;
 
 var baseColor = { red: 100, green: 100, blue: 100 };
@@ -38,8 +38,8 @@ var box = Entities.addEntity({
 
 function checkSound(deltaTime) {
   var started = false;
-    if (!sound.downloaded) { 
-      return; 
+    if (!sound.downloaded) {
+      return;
     }
     if (soundPlaying == null) {
         soundPlaying = Audio.playSound(sound, {
@@ -47,9 +47,9 @@ function checkSound(deltaTime) {
                                         volume: 1.0,
                                         loop: false } );
         started = true;
-    } else if (!soundPlaying.isPlaying) {
+    } else if (!soundPlaying.playing) {
         soundPlaying.restart();
-        started = true; 
+        started = true;
     }
     if (started) {
       Entities.editEntity(box, { color: litColor });
@@ -67,19 +67,19 @@ function checkSound(deltaTime) {
                     lifetime:  lightTime / 1000
                 });
       Script.setTimeout(resetColor, lightTime);
-    }  
+    }
     var currentDistance = Vec3.distance(MyAvatar.position, position);
     if (Math.abs(currentDistance - distance) > 1.0) {
       print("Distance from source: " + currentDistance);
       distance = currentDistance;
-    }   
+    }
 }
 
 function resetColor() {
    Entities.editEntity(box, { color: baseColor });
 }
 
-        
+
 function scriptEnding() {
   Entities.deleteEntity(box);
   if (soundPlaying) {
@@ -93,4 +93,3 @@ function scriptEnding() {
 // Connect a call back that happens every frame
 Script.scriptEnding.connect(scriptEnding);
 Script.update.connect(checkSound);
-