From 95b86bf5b7592a174c3ec629fd0c4a26b78dc218 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Tue, 23 Oct 2018 13:08:39 -0700
Subject: [PATCH 01/73] initial limited commerce for oculus store prototype

---
 .../qml/hifi/commerce/purchases/Purchases.qml |  5 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       | 68 +++++++++++++------
 scripts/system/commerce/wallet.js             |  3 +-
 scripts/system/html/js/marketplacesInject.js  |  1 +
 4 files changed, 53 insertions(+), 24 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 015ec3a172..24b365ffc4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -180,7 +180,8 @@ Rectangle {
     HifiCommerceCommon.EmulatedMarketplaceHeader {
         id: titleBarContainer;
         z: 997;
-        visible: !needsLogIn.visible;
+        visible: false; //HRS FIXME !needsLogIn.visible;
+        height: 100; // HRS FIXME
         // Size
         width: parent.width;
         // Anchors
@@ -475,7 +476,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.leftMargin: 16;
                 width: paintedWidth;
-                text: isShowingMyItems ? "My Items" : "My Purchases";
+                text: "Inventory"; // HRS FIXME isShowingMyItems ? "My Items" : "My Purchases";
                 color: hifi.colors.black;
                 size: 22;
             }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index cbb77883df..958906a839 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -20,6 +20,7 @@ import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 import "../common/sendAsset"
 import "../.." as HifiCommon
+import "../purchases" as HifiPurchases
 
 Rectangle {
     HifiConstants { id: hifi; }
@@ -64,7 +65,7 @@ Rectangle {
                 }
             } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
-                    root.activeView = "walletHome";
+                    root.activeView = "walletInventory"; // HRS FIXME "walletHome";
                     Commerce.getSecurityImage();
                 }
             } else {
@@ -124,7 +125,7 @@ Rectangle {
         // Title Bar text
         RalewaySemiBold {
             id: titleBarText;
-            text: "WALLET";
+            text: "ASSETS"; //"WALLET";
             // Text size
             size: hifi.fontSizes.overlayTitle;
             // Anchors
@@ -342,6 +343,17 @@ Rectangle {
                 }
             }
         }
+    }
+
+     HifiPurchases.Purchases {
+        id: walletInventory;
+        visible: root.activeView === "walletInventory";
+        anchors.top: titleBarContainer.bottom;
+        anchors.bottom: tabButtonsContainer.top;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+
+
     }
 
     HifiCommon.RootHttpRequest {
@@ -354,7 +366,6 @@ Rectangle {
         listModelName: "Send Money Connections";
         z: 997;
         visible: root.activeView === "sendMoney";
-        keyboardContainer: root;
         anchors.fill: parent;
         parentAppTitleBarHeight: titleBarContainer.height;
         parentAppNavBarHeight: tabButtonsContainer.height;
@@ -449,13 +460,13 @@ Rectangle {
             visible: !walletSetup.visible;
             color: root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: parent.left;
+            anchors.left: exchangeMoneyButtonContainer.right; // HRS FIXME parent.left;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
             HiFiGlyphs {
                 id: homeTabIcon;
-                text: hifi.glyphs.home2;
+                text: hifi.glyphs.leftRightArrows; // HRS FIXME hifi.glyphs.home2;
                 // Size
                 size: 50;
                 // Anchors
@@ -463,11 +474,11 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
             }
 
             RalewaySemiBold {
-                text: "WALLET HOME";
+                text: "RECENT ACTIVITY"; //"WALLET HOME";
                 // Text size
                 size: 16;
                 // Anchors
@@ -478,13 +489,13 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
                 verticalAlignment: Text.AlignTop;
             }
-            MouseArea {
+            /* HRS FIXME MouseArea {
                 id: walletHomeTabMouseArea;
                 anchors.fill: parent;
                 hoverEnabled: enabled;
@@ -494,22 +505,22 @@ Rectangle {
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;
                 onExited: parent.color = root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
-            }
+            }*/
         }
 
         // "EXCHANGE MONEY" tab button
         Rectangle {
             id: exchangeMoneyButtonContainer;
             visible: !walletSetup.visible;
-            color: hifi.colors.black;
+            color: root.activeView === "walletInventory" ? hifi.colors.blueAccent : hifi.colors.black; // HRS FIXME hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: walletHomeButtonContainer.right;
+            anchors.left: parent.left; // FIXME walletHomeButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
             HiFiGlyphs {
                 id: exchangeMoneyTabIcon;
-                text: hifi.glyphs.leftRightArrows;
+                text: hifi.glyphs.home2; // HRS FIXME hifi.glyphs.leftRightArrows;
                 // Size
                 size: 50;
                 // Anchors
@@ -517,11 +528,11 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: hifi.colors.lightGray50;
+                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight; // HRS FIXMEhifi.colors.lightGray50;
             }
 
             RalewaySemiBold {
-                text: "EXCHANGE MONEY";
+                text: "INVENTORY"; // HRS FIXME "EXCHANGE MONEY";
                 // Text size
                 size: 16;
                 // Anchors
@@ -532,12 +543,24 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: hifi.colors.lightGray50;
+                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;  // HRS FIXME hifi.colors.lightGray50;
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
                 verticalAlignment: Text.AlignTop;
             }
+
+            MouseArea {
+                id: inventoryTabMouseArea;
+                anchors.fill: parent;
+                hoverEnabled: enabled;
+                onClicked: {
+                    root.activeView = "walletInventory";
+                    tabButtonsContainer.resetTabButtonColors();
+                }
+                onEntered: parent.color = hifi.colors.blueHighlight;
+                onExited: parent.color = root.activeView === "walletInventory" ? hifi.colors.blueAccent : hifi.colors.black;
+            }
         }
 
 
@@ -547,7 +570,7 @@ Rectangle {
             visible: !walletSetup.visible;
             color: root.activeView === "sendMoney" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: exchangeMoneyButtonContainer.right;
+            anchors.left: walletHomeButtonContainer.right; // HRS FIXME exchangeMoneyButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
@@ -561,7 +584,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
             }
 
             RalewaySemiBold {
@@ -576,14 +599,14 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
                 verticalAlignment: Text.AlignTop;
             }
 
-            MouseArea {
+            /* HRS FIXME MouseArea {
                 id: sendMoneyTabMouseArea;
                 anchors.fill: parent;
                 hoverEnabled: enabled;
@@ -593,7 +616,7 @@ Rectangle {
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;
                 onExited: parent.color = root.activeView === "sendMoney" ? hifi.colors.blueAccent : hifi.colors.black;
-            }
+            } */
         }
 
         // "SECURITY" tab button
@@ -710,6 +733,7 @@ Rectangle {
             sendMoneyButtonContainer.color = hifi.colors.black;
             securityButtonContainer.color = hifi.colors.black;
             helpButtonContainer.color = hifi.colors.black;
+            exchangeMoneyButtonContainer.color = hifi.colors.black; // HRS FIXME
             if (root.activeView === "walletHome") {
                 walletHomeButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "sendMoney") {
@@ -718,6 +742,8 @@ Rectangle {
                 securityButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "help") {
                 helpButtonContainer.color = hifi.colors.blueAccent;
+            } else if (root.activeView == "walletInventory") {  // HRS FIXME
+                exchangeMoneyButtonContainer.color = hifi.colors.blueAccent;
             }
         }
     }
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 5b91afea33..afdd49c0d1 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -559,12 +559,13 @@ function uninstallMarketplaceItemTester() {
     }
 }
 
-var BUTTON_NAME = "WALLET";
+var BUTTON_NAME = "ASSETS"; //HRS FIXME "WALLET";
 var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
 var ui;
 function startup() {
     ui = new AppUi({
         buttonName: BUTTON_NAME,
+        buttonPrefix: "wallet-",
         sortOrder: 10,
         home: WALLET_QML_SOURCE,
         onOpened: walletOpened,
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 24a96023da..0bc0fac13d 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -219,6 +219,7 @@
             purchasesElement.style = "height:100%;margin-top:18px;font-weight:bold;float:right;margin-right:" + (dropDownElement.offsetWidth + 30) +
                 "px;position:relative;z-index:999;";
             navbarBrandElement.parentNode.insertAdjacentElement('beforeend', purchasesElement);
+            $('#purchasesButton').css('display', 'none'); // HRS FIXME
             $('#purchasesButton').on('click', function () {
                 EventBridge.emitWebEvent(JSON.stringify({
                     type: "PURCHASES",

From 7707d92a959657052a26fa4a5bd7afb60477ceb7 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Tue, 23 Oct 2018 16:07:35 -0700
Subject: [PATCH 02/73] connect wiring on purchases

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 958906a839..c2a8258cca 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -352,7 +352,11 @@ Rectangle {
         anchors.bottom: tabButtonsContainer.top;
         anchors.left: parent.left;
         anchors.right: parent.right;
-
+        Connections {
+            onSendToScript: {
+                sendToScript(message);
+            }
+        }
 
     }
 
@@ -822,7 +826,8 @@ Rectangle {
                 // Because we don't have "channels" for sending messages to a specific QML object, the messages are broadcast to all QML Items. If an Item of yours happens to be visible when some script sends a message with a method you don't expect, you'll get "Unrecognized message..." logs.
             break;
             default:
-                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+                // HRS FIXME console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+                walletInventory.fromScript(message);
         }
     }
     signal sendToScript(var message);

From ce20b82408dc4b5f7ac38a032e5d5cd9cff82abe Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 24 Oct 2018 10:41:14 -0700
Subject: [PATCH 03/73] fix view this item in my purchases

---
 scripts/system/marketplaces/marketplaces.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 3085145176..8f334674cb 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -23,7 +23,7 @@ Script.include("/~/system/libraries/connectionUtils.js");
 var MARKETPLACE_CHECKOUT_QML_PATH = "hifi/commerce/checkout/Checkout.qml";
 var MARKETPLACE_INSPECTIONCERTIFICATE_QML_PATH = "hifi/commerce/inspectionCertificate/InspectionCertificate.qml";
 var MARKETPLACE_ITEM_TESTER_QML_PATH = "hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml";
-var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/purchases/Purchases.qml";
+var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/wallet/Wallet.qml"; // HRS FIXME "hifi/commerce/purchases/Purchases.qml";
 var MARKETPLACE_WALLET_QML_PATH = "hifi/commerce/wallet/Wallet.qml";
 var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
 var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");

From 8ee6a0ceff9527da0fdd73137a267473f5e5ffc9 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 24 Oct 2018 11:37:02 -0700
Subject: [PATCH 04/73] disable priced items

---
 scripts/system/html/js/marketplacesInject.js | 25 +++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 0bc0fac13d..f24456cffc 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -284,6 +284,8 @@
                 $(this).attr('href', '#');
             }
             cost = $(this).closest('.col-xs-3').find('.item-cost').text();
+            var costInt = parseInt(cost, 10);
+            var disable = costInt > 0;  // HRS FIXME
 
             $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
             $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
@@ -292,22 +294,27 @@
             priceElement.css({
                 "padding": "3px 5px",
                 "height": "40px",
-                "background": "linear-gradient(#00b4ef, #0093C5)",
+                "background": disable ? "grey" : "linear-gradient(#00b4ef, #0093C5)",
                 "color": "#FFF",
                 "font-weight": "600",
                 "line-height": "34px"
             });
 
             if (parseInt(cost) > 0) {
-                priceElement.css({ "width": "auto" });
-                priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
-                    'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
-                priceElement.css({ "min-width": priceElement.width() + 30 });
+                if (disable) {
+                    priceElement.html('N/A');
+                } else {
+                    priceElement.css({ "width": "auto" });
+                    priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
+                                      'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
+                    priceElement.css({ "min-width": priceElement.width() + 30 });
+                }
             }
         });
 
         // change pricing to GET/BUY on button hover
         $('body').on('mouseenter', '#price-or-edit .price', function () {
+            if (disable) { return; }
             var $this = $(this);
             var buyString = "BUY";
             var getString = "GET";
@@ -332,12 +339,14 @@
         });
 
         $('body').on('mouseleave', '#price-or-edit .price', function () {
+            if (disable) { return; }
             var $this = $(this);
             $this.html($this.data('initialHtml'));
         });
 
 
         $('.grid-item').find('#price-or-edit').find('a').on('click', function () {
+            if (disable) { return false; }
             if ($(this).closest('.grid-item').find('.price').text() === 'invalidated') {
                 return false;
             }
@@ -420,7 +429,12 @@
 
                 var href = purchaseButton.attr('href');
                 purchaseButton.attr('href', '#');
+                var cost = $('.item-cost').text();
+                var costInt = parseInt(cost, 10);
                 var availability = $.trim($('.item-availability').text());
+                if (costInt > 0) {
+                    availability = ''; // HRS FIXME
+                }
                 if (availability === 'available') {
                     purchaseButton.css({
                         "background": "linear-gradient(#00b4ef, #0093C5)",
@@ -437,7 +451,6 @@
                     });
                 }
 
-                var cost = $('.item-cost').text();
                 var type = $('.item-type').text();
                 var isUpdating = window.location.href.indexOf('edition=') > -1;
                 var urlParams = new URLSearchParams(window.location.search);

From 993cb0cfa0392da8be8f94e34ad261d7f5152b26 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 24 Oct 2018 12:00:17 -0700
Subject: [PATCH 05/73] restore separation of inventory vs proofs.

---
 interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 24b365ffc4..11c1ffc8c2 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -476,7 +476,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.leftMargin: 16;
                 width: paintedWidth;
-                text: "Inventory"; // HRS FIXME isShowingMyItems ? "My Items" : "My Purchases";
+                text: isShowingMyItems ? "My Items" : "Inventory"; //"My Purchases";
                 color: hifi.colors.black;
                 size: 22;
             }

From e1e9b7842785e63a1eb4a4684f64343a363cc011 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 24 Oct 2018 12:22:03 -0700
Subject: [PATCH 06/73] filter priced items from marketplace

---
 scripts/system/html/js/marketplacesInject.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index f24456cffc..21a2acad7d 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -302,7 +302,8 @@
 
             if (parseInt(cost) > 0) {
                 if (disable) {
-                    priceElement.html('N/A');
+                    priceElement.html('N/A'); // In case the following fails
+                    $(this).parent().parent().parent().parent().parent().css({"display": "none"}); // HRS FIXME
                 } else {
                     priceElement.css({ "width": "auto" });
                     priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +

From 1ff50bc05ed338c3331329c43aa05c7407bdaf17 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 24 Oct 2018 12:45:17 -0700
Subject: [PATCH 07/73] updates notification applies to assets, and there is no
 wallet activity notification

---
 scripts/system/commerce/wallet.js           | 32 ++++++++++++++++++---
 scripts/system/marketplaces/marketplaces.js | 12 ++++----
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index afdd49c0d1..b1a00809fc 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -497,10 +497,33 @@ function walletClosed() {
 }
 
 function notificationDataProcessPage(data) {
-    return data.data.history;
+    return data.data.updates; // HRS FIXME .history;
 }
 
 var shouldShowDot = false;
+function notificationPollCallbackUpdates(updatesArray) {
+    shouldShowDot = shouldShowDot || updatesArray.length > 0;
+    ui.messagesWaiting(shouldShowDot && !ui.isOpen);
+
+    if (updatesArray.length > 0) {
+        var message;
+        if (!ui.notificationInitialCallbackMade) {
+            message = updatesArray.length + " of your purchased items " +
+                (updatesArray.length === 1 ? "has an update " : "have updates ") +
+                "available. Open MARKET to update.";
+            ui.notificationDisplayBanner(message);
+
+            ui.notificationPollCaresAboutSince = true;
+        } else {
+            for (var i = 0; i < updatesArray.length; i++) {
+                message = "Update available for \"" +
+                    updatesArray[i].base_item_title + "\"." +
+                    "Open MARKET to update.";
+                ui.notificationDisplayBanner(message);
+            }
+        }
+    }
+}
 function notificationPollCallback(historyArray) {
     if (!ui.isOpen) {
         var notificationCount = historyArray.length;
@@ -571,12 +594,13 @@ function startup() {
         onOpened: walletOpened,
         onClosed: walletClosed,
         onMessage: fromQml,
-        notificationPollEndpoint: "/api/v1/commerce/history?per_page=10",
+        // How are we going to handle two polls when --limitedCommerce is false?
+        notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10", // HRS FIXME "/api/v1/commerce/history?per_page=10",
         notificationPollTimeoutMs: 300000,
         notificationDataProcessPage: notificationDataProcessPage,
-        notificationPollCallback: notificationPollCallback,
+        notificationPollCallback: notificationPollCallbackUpdates,
         notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        notificationPollCaresAboutSince: true
+        notificationPollCaresAboutSince: false // HRS FIXME true
     });
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     installMarketplaceItemTester();
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 8f334674cb..15b8c4e7cb 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -1239,12 +1239,12 @@ function startup() {
         home: MARKETPLACE_URL_INITIAL,
         onScreenChanged: onTabletScreenChanged,
         onMessage: onQmlMessageReceived,
-        notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
-        notificationPollTimeoutMs: 300000,
-        notificationDataProcessPage: notificationDataProcessPage,
-        notificationPollCallback: notificationPollCallback,
-        notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        notificationPollCaresAboutSince: false // Changes to true after first poll
+        // notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
+        // notificationPollTimeoutMs: 300000,
+        // notificationDataProcessPage: notificationDataProcessPage,
+        // notificationPollCallback: notificationPollCallback,
+        // notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
+        // notificationPollCaresAboutSince: false // Changes to true after first poll
     });
     ContextOverlay.contextOverlayClicked.connect(openInspectionCertificateQML);
     Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);

From 4d34b12f06c9107e1d5c282711b6a8a6b7942d9b Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Sun, 21 Oct 2018 18:48:38 -0700
Subject: [PATCH 08/73] rather than do checkDevices to find new audio devices
 every 2 seconds, do each check 2 seconds after the previous one has
 completed.  This is done to avoid swamping the thread pool when the check
 takes a long time

---
 libraries/audio-client/src/AudioClient.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp
index d00bc29054..bdd6d0edc1 100644
--- a/libraries/audio-client/src/AudioClient.cpp
+++ b/libraries/audio-client/src/AudioClient.cpp
@@ -244,13 +244,20 @@ AudioClient::AudioClient() :
     // initialize wasapi; if getAvailableDevices is called from the CheckDevicesThread before this, it will crash
     getAvailableDevices(QAudio::AudioInput);
     getAvailableDevices(QAudio::AudioOutput);
-    
+
     // start a thread to detect any device changes
     _checkDevicesTimer = new QTimer(this);
-    connect(_checkDevicesTimer, &QTimer::timeout, this, [this] {
-        QtConcurrent::run(QThreadPool::globalInstance(), [this] { checkDevices(); });
-    });
     const unsigned long DEVICE_CHECK_INTERVAL_MSECS = 2 * 1000;
+    connect(_checkDevicesTimer, &QTimer::timeout, this, [=] {
+        QtConcurrent::run(QThreadPool::globalInstance(), [=] {
+            checkDevices();
+            // On some systems (Ubuntu) checking all the audio devices can take more than 2 seconds.  To
+            // avoid consuming all of the thread pool, don't start the check interval until the previous
+            // check has completed.
+            QMetaObject::invokeMethod(_checkDevicesTimer, "start", Q_ARG(int, DEVICE_CHECK_INTERVAL_MSECS));
+        });
+    });
+    _checkDevicesTimer->setSingleShot(true);
     _checkDevicesTimer->start(DEVICE_CHECK_INTERVAL_MSECS);
 
     // start a thread to detect peak value changes

From c85dbb823327a66c0c1290eedfb9566ce8c4947f Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 11:25:56 -0700
Subject: [PATCH 09/73] limitedCommerce switch

---
 interface/src/Application.cpp                        | 4 +++-
 interface/src/scripting/WalletScriptingInterface.cpp | 4 ----
 interface/src/scripting/WalletScriptingInterface.h   | 8 ++++++--
 interface/src/ui/overlays/Web3DOverlay.cpp           | 3 +++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index e515a22403..d053bb2d2d 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -1144,7 +1144,9 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
 
     // set the OCULUS_STORE property so the oculus plugin can know if we ran from the Oculus Store
     static const QString OCULUS_STORE_ARG = "--oculus-store";
-    setProperty(hifi::properties::OCULUS_STORE, arguments().indexOf(OCULUS_STORE_ARG) != -1);
+    bool isStore = arguments().indexOf(OCULUS_STORE_ARG) != -1;
+    setProperty(hifi::properties::OCULUS_STORE, isStore);
+    DependencyManager::get<WalletScriptingInterface>()->setLimitedCommerce(isStore);  // Or we could make it a separate arg, or if either arg is set, etc. And should this instead by a hifi::properties?
 
     updateHeartbeat();
 
diff --git a/interface/src/scripting/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
index e2158b9fd7..77ca232712 100644
--- a/interface/src/scripting/WalletScriptingInterface.cpp
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -15,10 +15,6 @@ CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(q
     Q_ASSERT(QThread::currentThread() == qApp->thread());
 }
 
-WalletScriptingInterface::WalletScriptingInterface() {
-
-}
-
 void WalletScriptingInterface::refreshWalletStatus() {
     auto wallet = DependencyManager::get<Wallet>();
     wallet->getWalletStatus();
diff --git a/interface/src/scripting/WalletScriptingInterface.h b/interface/src/scripting/WalletScriptingInterface.h
index 25955ca7a3..c4ab0da851 100644
--- a/interface/src/scripting/WalletScriptingInterface.h
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -29,7 +29,6 @@ public:
     CheckoutProxy(QObject* qmlObject, QObject* parent = nullptr);
 };
 
-
 /**jsdoc
  * @namespace Wallet
  *
@@ -40,11 +39,12 @@ public:
  */
 class WalletScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
+    SINGLETON_DEPENDENCY
 
     Q_PROPERTY(uint walletStatus READ getWalletStatus WRITE setWalletStatus NOTIFY walletStatusChanged)
+    Q_PROPERTY(bool limitedCommerce READ getLimitedCommerce WRITE setLimitedCommerce)
 
 public:
-    WalletScriptingInterface();
 
     /**jsdoc
      * @function Wallet.refreshWalletStatus
@@ -67,6 +67,9 @@ public:
     //     scripts could cause the Wallet to incorrectly report its status.
     void setWalletStatus(const uint& status);
 
+  bool getLimitedCommerce() { return _limitedCommerce; }
+  void setLimitedCommerce(bool isLimited) { _limitedCommerce = isLimited; }
+
 signals:
 
     /**jsdoc
@@ -97,6 +100,7 @@ signals:
 
 private:
     uint _walletStatus;
+    bool _limitedCommerce = false;
 };
 
 #endif // hifi_WalletScriptingInterface_h
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 084615cae2..1a1bd00655 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -53,6 +53,7 @@
 #include "ui/AvatarInputs.h"
 #include "avatar/AvatarManager.h"
 #include "scripting/AccountServicesScriptingInterface.h"
+#include "scripting/WalletScriptingInterface.h"
 #include <plugins/InputConfiguration.h>
 #include "ui/Snapshot.h"
 #include "SoundCacheScriptingInterface.h"
@@ -95,6 +96,7 @@ Web3DOverlay::Web3DOverlay() {
     _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
     _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
     _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
+    _webSurface->getSurfaceContext()->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
 }
 
 Web3DOverlay::Web3DOverlay(const Web3DOverlay* Web3DOverlay) :
@@ -269,6 +271,7 @@ void Web3DOverlay::setupQmlSurface(bool isTablet) {
         _webSurface->getSurfaceContext()->setContextProperty("Web3DOverlay", this);
         _webSurface->getSurfaceContext()->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("Reticle", qApp->getApplicationCompositor().getReticleInterface());
+        _webSurface->getSurfaceContext()->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("HiFiAbout", AboutUtil::getInstance());
         _webSurface->getSurfaceContext()->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
 

From 6284c902be777e5342ee6c8579caeab7646a0027 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 11:29:10 -0700
Subject: [PATCH 10/73] use the switch

---
 .../qml/hifi/commerce/purchases/Purchases.qml |  6 +--
 .../qml/hifi/commerce/wallet/Wallet.qml       | 51 +++++++++++--------
 scripts/system/commerce/wallet.js             |  3 +-
 scripts/system/html/js/marketplacesInject.js  | 17 ++++---
 scripts/system/marketplaces/marketplaces.js   |  3 +-
 5 files changed, 45 insertions(+), 35 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 11c1ffc8c2..b0d976b499 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -180,8 +180,8 @@ Rectangle {
     HifiCommerceCommon.EmulatedMarketplaceHeader {
         id: titleBarContainer;
         z: 997;
-        visible: false; //HRS FIXME !needsLogIn.visible;
-        height: 100; // HRS FIXME
+        visible: false;
+        height: 100; // HRS FIXME: get rid of the header and associated code entirely?
         // Size
         width: parent.width;
         // Anchors
@@ -476,7 +476,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.leftMargin: 16;
                 width: paintedWidth;
-                text: isShowingMyItems ? "My Items" : "Inventory"; //"My Purchases";
+                text: isShowingMyItems ? "My Items" : "Inventory";
                 color: hifi.colors.black;
                 size: 22;
             }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index c2a8258cca..c8fb346711 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -30,6 +30,7 @@ Rectangle {
     property string activeView: "initialize";
     property bool keyboardRaised: false;
     property bool isPassword: false;
+    property bool limitedCommerce: true;
 
     anchors.fill: (typeof parent === undefined) ? undefined : parent;
 
@@ -65,7 +66,7 @@ Rectangle {
                 }
             } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
-                    root.activeView = "walletInventory"; // HRS FIXME "walletHome";
+                    root.activeView = "walletInventory";
                     Commerce.getSecurityImage();
                 }
             } else {
@@ -125,7 +126,7 @@ Rectangle {
         // Title Bar text
         RalewaySemiBold {
             id: titleBarText;
-            text: "ASSETS"; //"WALLET";
+            text: "ASSETS";
             // Text size
             size: hifi.fontSizes.overlayTitle;
             // Anchors
@@ -370,6 +371,7 @@ Rectangle {
         listModelName: "Send Money Connections";
         z: 997;
         visible: root.activeView === "sendMoney";
+        keyboardContainer: root;
         anchors.fill: parent;
         parentAppTitleBarHeight: titleBarContainer.height;
         parentAppNavBarHeight: tabButtonsContainer.height;
@@ -464,13 +466,13 @@ Rectangle {
             visible: !walletSetup.visible;
             color: root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: exchangeMoneyButtonContainer.right; // HRS FIXME parent.left;
+            anchors.left: exchangeMoneyButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
             HiFiGlyphs {
                 id: homeTabIcon;
-                text: hifi.glyphs.leftRightArrows; // HRS FIXME hifi.glyphs.home2;
+                text: hifi.glyphs.leftRightArrows;
                 // Size
                 size: 50;
                 // Anchors
@@ -478,11 +480,11 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
             }
 
             RalewaySemiBold {
-                text: "RECENT ACTIVITY"; //"WALLET HOME";
+                text: "RECENT ACTIVITY";
                 // Text size
                 size: 16;
                 // Anchors
@@ -493,15 +495,16 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
                 verticalAlignment: Text.AlignTop;
             }
-            /* HRS FIXME MouseArea {
+            MouseArea {
                 id: walletHomeTabMouseArea;
                 anchors.fill: parent;
+                enabled: !root.limitedCommerce;
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "walletHome";
@@ -509,22 +512,22 @@ Rectangle {
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;
                 onExited: parent.color = root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
-            }*/
+            }
         }
 
         // "EXCHANGE MONEY" tab button
         Rectangle {
             id: exchangeMoneyButtonContainer;
             visible: !walletSetup.visible;
-            color: root.activeView === "walletInventory" ? hifi.colors.blueAccent : hifi.colors.black; // HRS FIXME hifi.colors.black;
+            color: root.activeView === "walletInventory" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: parent.left; // FIXME walletHomeButtonContainer.right;
+            anchors.left: parent.left;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
             HiFiGlyphs {
                 id: exchangeMoneyTabIcon;
-                text: hifi.glyphs.home2; // HRS FIXME hifi.glyphs.leftRightArrows;
+                text: hifi.glyphs.home2;
                 // Size
                 size: 50;
                 // Anchors
@@ -532,11 +535,11 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight; // HRS FIXMEhifi.colors.lightGray50;
+                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
             }
 
             RalewaySemiBold {
-                text: "INVENTORY"; // HRS FIXME "EXCHANGE MONEY";
+                text: "INVENTORY";
                 // Text size
                 size: 16;
                 // Anchors
@@ -547,7 +550,7 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;  // HRS FIXME hifi.colors.lightGray50;
+                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
@@ -574,7 +577,7 @@ Rectangle {
             visible: !walletSetup.visible;
             color: root.activeView === "sendMoney" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: walletHomeButtonContainer.right; // HRS FIXME exchangeMoneyButtonContainer.right;
+            anchors.left: walletHomeButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
@@ -588,7 +591,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
             }
 
             RalewaySemiBold {
@@ -603,16 +606,17 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: hifi.colors.lightGray50; // HRS FIXME root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
                 verticalAlignment: Text.AlignTop;
             }
 
-            /* HRS FIXME MouseArea {
+            MouseArea {
                 id: sendMoneyTabMouseArea;
                 anchors.fill: parent;
+                enabled: !root.limitedCommerce;
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "sendMoney";
@@ -620,7 +624,7 @@ Rectangle {
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;
                 onExited: parent.color = root.activeView === "sendMoney" ? hifi.colors.blueAccent : hifi.colors.black;
-            } */
+            }
         }
 
         // "SECURITY" tab button
@@ -737,7 +741,7 @@ Rectangle {
             sendMoneyButtonContainer.color = hifi.colors.black;
             securityButtonContainer.color = hifi.colors.black;
             helpButtonContainer.color = hifi.colors.black;
-            exchangeMoneyButtonContainer.color = hifi.colors.black; // HRS FIXME
+            exchangeMoneyButtonContainer.color = hifi.colors.black;
             if (root.activeView === "walletHome") {
                 walletHomeButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "sendMoney") {
@@ -746,7 +750,7 @@ Rectangle {
                 securityButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "help") {
                 helpButtonContainer.color = hifi.colors.blueAccent;
-            } else if (root.activeView == "walletInventory") {  // HRS FIXME
+            } else if (root.activeView == "walletInventory") {
                 exchangeMoneyButtonContainer.color = hifi.colors.blueAccent;
             }
         }
@@ -825,6 +829,9 @@ Rectangle {
             case 'avatarDisconnected':
                 // Because we don't have "channels" for sending messages to a specific QML object, the messages are broadcast to all QML Items. If an Item of yours happens to be visible when some script sends a message with a method you don't expect, you'll get "Unrecognized message..." logs.
             break;
+            case 'setLimitedCommerce':
+                root.limitedCommerce = message.limitedCommerce;
+                break;
             default:
                 // HRS FIXME console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
                 walletInventory.fromScript(message);
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index b1a00809fc..58f39ca54c 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -490,6 +490,7 @@ function walletOpened() {
     triggerPressMapping.enable();
     shouldShowDot = false;
     ui.messagesWaiting(shouldShowDot);
+    ui.sendMessage({method: 'setLimitedCommerce', limitedCommerce: Wallet.limitedCommerce}); // HRS FIXME Wallet should be accessible in qml. Why isn't it?
 }
 
 function walletClosed() {
@@ -582,7 +583,7 @@ function uninstallMarketplaceItemTester() {
     }
 }
 
-var BUTTON_NAME = "ASSETS"; //HRS FIXME "WALLET";
+var BUTTON_NAME = "ASSETS";
 var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
 var ui;
 function startup() {
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 21a2acad7d..e1863f791a 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -27,6 +27,7 @@
     var xmlHttpRequest = null;
     var isPreparing = false; // Explicitly track download request status.
 
+    var limitedCommerce = false;
     var commerceMode = false;
     var userIsLoggedIn = false;
     var walletNeedsSetup = false;
@@ -219,7 +220,9 @@
             purchasesElement.style = "height:100%;margin-top:18px;font-weight:bold;float:right;margin-right:" + (dropDownElement.offsetWidth + 30) +
                 "px;position:relative;z-index:999;";
             navbarBrandElement.parentNode.insertAdjacentElement('beforeend', purchasesElement);
-            $('#purchasesButton').css('display', 'none'); // HRS FIXME
+            if (limitedCommerce) {
+                $('#purchasesButton').css('display', 'none');
+            }
             $('#purchasesButton').on('click', function () {
                 EventBridge.emitWebEvent(JSON.stringify({
                     type: "PURCHASES",
@@ -285,7 +288,7 @@
             }
             cost = $(this).closest('.col-xs-3').find('.item-cost').text();
             var costInt = parseInt(cost, 10);
-            var disable = costInt > 0;  // HRS FIXME
+            var disable = limitedCommerce && (costInt > 0);
 
             $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
             $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
@@ -303,7 +306,7 @@
             if (parseInt(cost) > 0) {
                 if (disable) {
                     priceElement.html('N/A'); // In case the following fails
-                    $(this).parent().parent().parent().parent().parent().css({"display": "none"}); // HRS FIXME
+                    $(this).parent().parent().parent().parent().parent().css({"display": "none"}); // HRS FIXME, oh and do I have to set display non-none in the other branch?
                 } else {
                     priceElement.css({ "width": "auto" });
                     priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
@@ -315,7 +318,6 @@
 
         // change pricing to GET/BUY on button hover
         $('body').on('mouseenter', '#price-or-edit .price', function () {
-            if (disable) { return; }
             var $this = $(this);
             var buyString = "BUY";
             var getString = "GET";
@@ -340,14 +342,12 @@
         });
 
         $('body').on('mouseleave', '#price-or-edit .price', function () {
-            if (disable) { return; }
             var $this = $(this);
             $this.html($this.data('initialHtml'));
         });
 
 
         $('.grid-item').find('#price-or-edit').find('a').on('click', function () {
-            if (disable) { return false; }
             if ($(this).closest('.grid-item').find('.price').text() === 'invalidated') {
                 return false;
             }
@@ -433,8 +433,8 @@
                 var cost = $('.item-cost').text();
                 var costInt = parseInt(cost, 10);
                 var availability = $.trim($('.item-availability').text());
-                if (costInt > 0) {
-                    availability = ''; // HRS FIXME
+                if (limitedCommerce && (costInt > 0)) {
+                    availability = '';
                 }
                 if (availability === 'available') {
                     purchaseButton.css({
@@ -757,6 +757,7 @@
                 cancelClaraDownload();
             } else if (message.type === "marketplaces") {
                 if (message.action === "commerceSetting") {
+                    limitedCommerce = !!message.data.limitedCommerce;
                     commerceMode = !!message.data.commerceMode;
                     userIsLoggedIn = !!message.data.userIsLoggedIn;
                     walletNeedsSetup = !!message.data.walletNeedsSetup;
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 15b8c4e7cb..5b1d5c8897 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -230,7 +230,8 @@ function sendCommerceSettings() {
             userIsLoggedIn: Account.loggedIn,
             walletNeedsSetup: walletNeedsSetup(),
             metaverseServerURL: Account.metaverseServerURL,
-            messagesWaiting: shouldShowDot
+            messagesWaiting: shouldShowDot,
+            limitedCommerce: Wallet.limitedCommerce
         }
     });
 }

From 8b797952479eb1b5db73d20ac15fedf5926bc7de Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 12:31:01 -0700
Subject: [PATCH 11/73] nix the word "purchase" where possible

---
 .../qml/hifi/commerce/checkout/Checkout.qml   | 26 +++++++++----------
 .../common/EmulatedMarketplaceHeader.qml      |  2 +-
 .../hifi/commerce/common/FirstUseTutorial.qml |  4 +--
 .../qml/hifi/commerce/purchases/Purchases.qml |  2 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       |  2 +-
 .../qml/hifi/commerce/wallet/WalletHome.qml   |  2 +-
 scripts/system/html/js/marketplacesInject.js  |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index b13f23f17d..19cc0d2d9d 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -383,7 +383,7 @@ Rectangle {
             anchors.leftMargin: 16;
             width: paintedWidth;
             height: paintedHeight;
-            text: "Review Purchase:";
+            text: "Review:";
             color: hifi.colors.black;
             size: 28;
         }
@@ -570,7 +570,7 @@ Rectangle {
                 height: 50;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                text: root.isUpdating ? "UPDATE TO THIS ITEM FOR FREE" : "VIEW THIS ITEM IN MY PURCHASES";
+                text: root.isUpdating ? "UPDATE TO THIS ITEM FOR FREE" : "VIEW THIS ITEM IN YOUR INVENTORY";
                 onClicked: {
                     if (root.isUpdating) {
                         sendToScript({method: 'checkout_goToPurchases', filterText: root.baseItemName});
@@ -608,9 +608,9 @@ Rectangle {
                     } else if (root.isCertified) {
                         if (!root.shouldBuyWithControlledFailure) {
                             if (root.itemType === "contentSet" && !Entities.canReplaceContent()) {
-                                lightboxPopup.titleText = "Purchase Content Set";
+                                lightboxPopup.titleText = "Get Content Set";
                                 lightboxPopup.bodyText = "You will not be able to replace this domain's content with <b>" + root.itemName +
-                                    " </b>until the server owner gives you 'Replace Content' permissions.<br><br>Are you sure you want to purchase this content set?";
+                                    " </b>until the server owner gives you 'Replace Content' permissions.<br><br>Are you sure you want to get this content set?";
                                 lightboxPopup.button1text = "CANCEL";
                                 lightboxPopup.button1method = function() {
                                     lightboxPopup.visible = false;
@@ -694,7 +694,7 @@ Rectangle {
             id: completeText2;
             text: "The " + (root.itemTypesText)[itemTypesArray.indexOf(root.itemType)] +
                 ' <font color="' + hifi.colors.blueAccent + '"><a href="#">' + root.itemName + '</a></font>' +
-                " has been added to your Purchases and a receipt will appear in your Wallet's transaction history.";
+                " has been added to your Inventory.";
             // Text size
             size: 18;
             // Anchors
@@ -864,7 +864,7 @@ Rectangle {
 
         RalewaySemiBold {
             id: myPurchasesLink;
-            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View this item in My Purchases</a></font>';
+            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View this item in your Inventory</a></font>';
             // Text size
             size: 18;
             // Anchors
@@ -908,7 +908,7 @@ Rectangle {
 
         RalewayRegular {
             id: pendingText;
-            text: 'Your item is marked "pending" while your purchase is being confirmed. ' +
+            text: 'Your item is marked "pending" while it is being confirmed. ' +
             '<b><font color="' + hifi.colors.primaryHighlight + '"><a href="#">Learn More</a></font></b>';
             // Text size
             size: 18;
@@ -925,8 +925,8 @@ Rectangle {
             horizontalAlignment: Text.AlignLeft;
             verticalAlignment: Text.AlignVCenter;
             onLinkActivated: {
-                lightboxPopup.titleText = "Purchase Confirmations";
-                lightboxPopup.bodyText = 'Your item is marked "pending" while your purchase is being confirmed.<br><br>' +
+                lightboxPopup.titleText = "Confirmations";
+                lightboxPopup.bodyText = 'Your item is marked "pending" while it is being confirmed.<br><br>' +
                 'Confirmations usually take about 90 seconds.';
                 lightboxPopup.button1text = "CLOSE";
                 lightboxPopup.button1method = function() {
@@ -971,7 +971,7 @@ Rectangle {
 
         RalewayRegular {
             id: failureHeaderText;
-            text: "<b>Purchase Failed.</b><br>Your Purchases and HFC balance haven't changed.";
+            text: "<b>Purchase Failed.</b><br>Your Inventory and HFC balance haven't changed.";
             // Text size
             size: 24;
             // Anchors
@@ -1122,10 +1122,10 @@ Rectangle {
         if (root.balanceAfterPurchase < 0) {
             // If you already own the item...
             if (!root.alreadyOwned) {
-                buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item.</b>";
+                buyText.text = "<b>You do not have sufficient funds to purchase this item.</b>";
             // Else if you don't already own the item...
             } else if (canBuyAgain()) {
-                buyText.text = "<b>Your Wallet does not have sufficient funds to purchase this item again.</b>";
+                buyText.text = "<b>You do not have sufficient funds to purchase this item again.</b>";
             } else {
                 buyText.text = "<b>While you do not have sufficient funds to buy this, you already have this item.</b>"
             }
@@ -1171,7 +1171,7 @@ Rectangle {
                 buyText.text = "";
             }
         } else {
-            buyText.text = '<i>This type of item cannot currently be certified, so it will not show up in "My Purchases". You can access it again for free from the Marketplace.</i>';
+            buyText.text = '<i>This type of item cannot currently be certified, so it will not show up in "Inventory". You can access it again for free from the Marketplace.</i>';
             buyTextContainer.color = hifi.colors.white;
             buyTextContainer.border.color = hifi.colors.white;
             buyGlyph.text = "";
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 1b77dcd3e9..de9c62c197 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -128,7 +128,7 @@ Item {
 
                 RalewaySemiBold {
                     id: myPurchasesText;
-                    text: "My Purchases";
+                    text: "Inventory";
                     // Text size
                     size: 18;
                     // Style
diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
index 5f874d3f04..0b982893f1 100644
--- a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
+++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
@@ -87,7 +87,7 @@ Rectangle {
         }
         RalewayRegular {
             id: introText2;
-            text: "My Purchases";
+            text: "Inventory";
             // Text size
             size: 22;
             // Anchors
@@ -116,7 +116,7 @@ Rectangle {
 
         RalewayRegular {
             id: step1text;
-            text: "The <b>'REZ IT'</b> button makes your purchase appear in front of you.";
+            text: "The <b>'REZ IT'</b> button makes your item appear in front of you.";
             // Text size
             size: 20;
             // Anchors
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index b0d976b499..655af79e68 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -946,7 +946,7 @@ Rectangle {
             // Explanitory text
             RalewayRegular {
                 id: haventPurchasedYet;
-                text: "<b>You haven't purchased anything yet!</b><br><br>Get an item from <b>Marketplace</b> to add it to My Purchases.";
+                text: "<b>You haven't gotten anything yet!</b><br><br>Get an item from <b>Marketplace</b> to add it to your Inventory.";
                 // Text size
                 size: 22;
                 // Anchors
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index c8fb346711..d66ed62768 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -404,7 +404,7 @@ Rectangle {
                     lightboxPopup.titleText = "Automatically Log Out";
                     lightboxPopup.bodyText = "By default, after you log in to High Fidelity, you will stay logged in to your High Fidelity " +
                         "account even after you close and re-open Interface. This means anyone who opens Interface on your computer " +
-                        "could make purchases with your Wallet.\n\n" +
+                        "could make purchases with your HFC.\n\n" +
                         "If you do not want to stay logged in across Interface sessions, check this box.";
                     lightboxPopup.button1text = "CLOSE";
                     lightboxPopup.button1method = function() {
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 627da1d43f..246773ff07 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -181,7 +181,7 @@ Item {
 
         RalewaySemiBold {
             id: myPurchasesLink;
-            text: '<font color="#0093C5"><a href="#myPurchases">My Purchases</a></font>';
+            text: '<font color="#0093C5"><a href="#myPurchases">Inventory</a></font>';
             // Anchors
             anchors.top: parent.top;
             anchors.topMargin: 26;
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index e1863f791a..43fd9ab935 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -458,7 +458,7 @@
                 if (isUpdating) {
                     purchaseButton.html('UPDATE FOR FREE');
                 } else if (availability !== 'available') {
-                    purchaseButton.html('UNAVAILABLE (' + availability + ')');
+                    purchaseButton.html('UNAVAILABLE' + (availability ? ('(' + availability + ')') : ''));
                 } else if (parseInt(cost) > 0 && $('#side-info').find('#buyItemButton').size() === 0) {
                     purchaseButton.html('PURCHASE <span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
                         'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);

From e3b1e14db6ffc94470f1ee2fabfb6a587816d04c Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 12:37:08 -0700
Subject: [PATCH 12/73] nix "buy" where possible.

---
 interface/resources/qml/LoginDialog/LinkAccountBody.qml   | 2 +-
 interface/resources/qml/hifi/avatarapp/MessageBoxes.qml   | 8 ++++----
 .../resources/qml/hifi/commerce/wallet/NeedsLogIn.qml     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 48cf124127..00980b0876 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -96,7 +96,7 @@ Item {
             topMargin: hifi.dimensions.contentSpacing.y
         }
 
-        text: qsTr("Sign in to High Fidelity to make friends, get HFC, and buy interesting things on the Marketplace!")
+        text: qsTr("Sign in to High Fidelity to make friends, get HFC, and get interesting things on the Marketplace!")
         width: parent.width
         wrapMode: Text.WordWrap
         lineHeight: 1
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
index b7782c697d..2c02272b46 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@@ -63,8 +63,8 @@ MessageBox {
         popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
         popup.button1text = 'CANCEL'
         popup.titleText = 'Get Wearables'
-        popup.bodyText = 'Buy wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
-                'Wear wearable from <b><a href="app://purchases">My Purchases.</a></b>' + '<br/>' + '<br/>' +
+        popup.bodyText = 'Get wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
+                'Wear wearable from <b><a href="app://purchases">Inventory.</a></b>' + '<br/>' + '<br/>' +
                 'Visit “AvatarIsland” to get wearables'
 
         popup.imageSource = getWearablesUrl;
@@ -128,8 +128,8 @@ MessageBox {
         popup.button1text = 'CANCEL'
         popup.titleText = 'Get Avatars'
 
-        popup.bodyText = 'Buy avatars from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
-                         'Wear avatars in <b><a href="app://purchases">My Purchases.</a></b>' + '<br/>' + '<br/>' +
+        popup.bodyText = 'Get avatars from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
+                         'Wear avatars in <b><a href="app://purchases">Inventory.</a></b>' + '<br/>' + '<br/>' +
                          'Visit “BodyMart” to get free avatars.'
 
         popup.imageSource = getAvatarsUrl;
diff --git a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
index eadf1ca8a2..03af964830 100644
--- a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
@@ -93,7 +93,7 @@ Item {
         // Text below helper text
         RalewayRegular {
             id: loginDetailText;
-            text: "To buy/sell items on the <b>Marketplace</b>, or to use your <b>Wallet</b>, you must first log in to High Fidelity.";
+            text: "To get items on the <b>Marketplace</b>, or to use your <b>Assets</b>, you must first log in to High Fidelity.";
             // Text size
             size: 18;
             // Anchors

From 3503d79b052f3aa174ab570b36162ebd7e32f0be Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 12:39:33 -0700
Subject: [PATCH 13/73] missed a buy/purchase

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 19cc0d2d9d..6ff7c1ef1c 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -594,7 +594,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.right: parent.right;
                 text: (root.isUpdating && root.itemEdition > 0) ? "CONFIRM UPDATE" : (((root.isCertified) ? ((ownershipStatusReceived && balanceReceived && availableUpdatesReceived) ?
-                    ((viewInMyPurchasesButton.visible && !root.isUpdating) ? "Buy It Again" : "Confirm Purchase") : "--") : "Get Item"));
+                    ((viewInMyPurchasesButton.visible && !root.isUpdating) ? "Get It Again" : "Confirm") : "--") : "Get Item"));
                 onClicked: {
                     if (root.isUpdating && root.itemEdition > 0) {
                         // If we're updating an app, the existing app needs to be uninstalled.

From 936c2b2cab7a12f675e797a57e587a73665cafe7 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 12:46:30 -0700
Subject: [PATCH 14/73] don't show price for free items

---
 interface/resources/qml/hifi/commerce/checkout/Checkout.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 6ff7c1ef1c..f88a70ff05 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -448,7 +448,7 @@ Rectangle {
                 // "HFC" balance label
                 HiFiGlyphs {
                     id: itemPriceTextLabel;
-                    visible: !(root.isUpdating && root.itemEdition > 0);
+                    visible: !(root.isUpdating && root.itemEdition > 0) && (root.itemPrice > 0);
                     text: hifi.glyphs.hfc;
                     // Size
                     size: 30;
@@ -464,7 +464,7 @@ Rectangle {
                 }
                 FiraSansSemiBold {
                     id: itemPriceText;
-                    text: (root.isUpdating && root.itemEdition > 0) ? "FREE\nUPDATE" : ((root.itemPrice === -1) ? "--" : root.itemPrice);
+                    text: (root.isUpdating && root.itemEdition > 0) ? "FREE\nUPDATE" : ((root.itemPrice === -1) ? "--" : ((root.itemPrice > 0) ? root.itemPrice : "FREE"));
                     // Text size
                     size: (root.isUpdating && root.itemEdition > 0) ? 20 : 26;
                     // Anchors

From 9095df46416c51874aeb2cc1d9028aaddbea5a9e Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 25 Oct 2018 12:59:49 -0700
Subject: [PATCH 15/73] fix getting inventory back after showing my items

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index d66ed62768..ee86844aaa 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -563,6 +563,7 @@ Rectangle {
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "walletInventory";
+                    walletInventory.isShowingMyItems = false;
                     tabButtonsContainer.resetTabButtonColors();
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;

From 015b5fa681e03bef2a676416212133c8daa8da5e Mon Sep 17 00:00:00 2001
From: David Kelly <davidmichaelkelly@gmail.com>
Date: Tue, 30 Oct 2018 08:01:22 -0700
Subject: [PATCH 16/73] Don't attempt purchase of sold out items

---
 scripts/system/html/js/marketplacesInject.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 24a96023da..c667d6dc28 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -312,11 +312,12 @@
             var getString = "GET";
             // Protection against the button getting stuck in the "BUY"/"GET" state.
             // That happens when the browser gets two MOUSEENTER events before getting a
-            // MOUSELEAVE event.
-            if ($this.text() === buyString || $this.text() === getString) {
-                return;
-            }
-            if ($this.text() === 'invalidated') {
+            // MOUSELEAVE event. Also, if not available for sale, just return.
+            if ($this.text() === buyString ||
+                $this.text() === getString ||
+                $this.text() === 'invalidated' ||
+                $this.text() === 'sold out' ||
+                $this.text() === 'not for sale' ) {
                 return;
             }
             $this.data('initialHtml', $this.html());
@@ -337,7 +338,10 @@
 
 
         $('.grid-item').find('#price-or-edit').find('a').on('click', function () {
-            if ($(this).closest('.grid-item').find('.price').text() === 'invalidated') {
+            var price = $(this).closest('.grid-item').find('.price').text();
+            if (price === 'invalidated' ||
+                price === 'sold out' ||
+                price === 'not for sale') {
                 return false;
             }
             buyButtonClicked($(this).closest('.grid-item').attr('data-item-id'),

From 959c544fcdd9e4b6f2a09b3fb62a2e862ca79069 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Tue, 30 Oct 2018 12:05:41 -0700
Subject: [PATCH 17/73] Made path to VCPKG relative.

---
 tools/auto-tester/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index 06930ab0fe..1befa6332e 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -57,10 +57,10 @@ if (WIN32)
     )
         
     # add a custom command to copy the SSL DLLs
-    add_custom_command(
+     add_custom_command(
         TARGET ${TARGET_NAME}
         POST_BUILD
-        COMMAND "${CMAKE_COMMAND}" -E copy_directory D:/GitHub/vcpkg/installed/x64-windows/bin "$<TARGET_FILE_DIR:${TARGET_NAME}>"
+        COMMAND "${CMAKE_COMMAND}" -E copy_directory "$ENV{VCPKG_ROOT}/installed/x64-windows/bin" "$<TARGET_FILE_DIR:${TARGET_NAME}>"
     )
 
 endif ()
\ No newline at end of file

From b6344acc1d047dc630b266f594b08fb11f7e089a Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 30 Oct 2018 15:03:10 -0700
Subject: [PATCH 18/73] Big checkpoint. be aware - things may be broken

---
 .../qml/hifi/avatarapp/MessageBoxes.qml       |   2 +-
 .../qml/hifi/commerce/checkout/Checkout.qml   |  15 +-
 .../common/EmulatedMarketplaceHeader.qml      |  54 --
 .../commerce/common/sendAsset/SendAsset.qml   |  12 +-
 .../hifi/commerce/purchases/PurchasedItem.qml |   1 +
 .../qml/hifi/commerce/purchases/Purchases.qml |  26 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       |  93 ++-
 interface/src/Application.cpp                 |   8 +-
 interface/src/commerce/Ledger.cpp             |   1 -
 .../src/scripting/WalletScriptingInterface.h  |  28 +-
 interface/src/ui/overlays/Web3DOverlay.cpp    |   3 +-
 scripts/system/avatarapp.js                   |   8 +-
 scripts/system/commerce/wallet.js             | 161 +++--
 scripts/system/edit.js                        |   2 +-
 scripts/system/html/js/marketplacesInject.js  |  47 +-
 scripts/system/marketplaces/marketplace.js    |   2 +-
 scripts/system/marketplaces/marketplaces.js   | 568 +-----------------
 scripts/system/notifications.js               |   2 +-
 18 files changed, 279 insertions(+), 754 deletions(-)

diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
index 2c02272b46..89a8eff025 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@@ -89,7 +89,7 @@ MessageBox {
 
     function showDeleteFavorite(favoriteName, callback) {
         popup.titleText = 'Delete Favorite: {AvatarName}'.replace('{AvatarName}', favoriteName)
-        popup.bodyText = 'This will delete your favorite. You will retain access to the wearables and avatar that made up the favorite from My Purchases.'
+        popup.bodyText = 'This will delete your favorite. You will retain access to the wearables and avatar that made up the favorite from Inventory.'
         popup.imageSource = null;
         popup.button1text = 'CANCEL'
         popup.button2text = 'DELETE'
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index f88a70ff05..95b040eceb 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -559,7 +559,7 @@ Rectangle {
                 }
             }
 
-            // "View in My Purchases" button
+            // "View in Inventory" button
             HifiControlsUit.Button {
                 id: viewInMyPurchasesButton;
                 visible: false;
@@ -833,7 +833,7 @@ Rectangle {
                 }
                 lightboxPopup.button2text = "OPEN GOTO";
                 lightboxPopup.button2method = function() {
-                    sendToScript({method: 'purchases_openGoTo'});
+                    sendToScript({method: 'checkout_openGoTo'});
                     lightboxPopup.visible = false;
                 };
                 lightboxPopup.visible = true;
@@ -886,7 +886,8 @@ Rectangle {
 
         RalewaySemiBold {
             id: walletLink;
-            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View receipt in Wallet</a></font>';
+            visible: !WalletScriptingInterface.limitedCommerce;
+            text: '<font color="' + hifi.colors.primaryHighlight + '"><a href="#">View receipt in Recent Activity</a></font>';
             // Text size
             size: 18;
             // Anchors
@@ -902,18 +903,18 @@ Rectangle {
             horizontalAlignment: Text.AlignLeft;
             verticalAlignment: Text.AlignVCenter;
             onLinkActivated: {
-                sendToScript({method: 'purchases_openWallet'});
+                sendToScript({method: 'checkout_openWallet'});
             }
         }
 
         RalewayRegular {
             id: pendingText;
-            text: 'Your item is marked "pending" while it is being confirmed. ' +
+            text: 'Your item is marked "pending" while the transfer is being confirmed. ' +
             '<b><font color="' + hifi.colors.primaryHighlight + '"><a href="#">Learn More</a></font></b>';
             // Text size
             size: 18;
             // Anchors
-            anchors.top: walletLink.bottom;
+            anchors.top: walletLink.visible ? walletLink.bottom : myPurchasesLink.bottom;
             anchors.topMargin: 32;
             height: paintedHeight;
             anchors.left: parent.left;
@@ -926,7 +927,7 @@ Rectangle {
             verticalAlignment: Text.AlignVCenter;
             onLinkActivated: {
                 lightboxPopup.titleText = "Confirmations";
-                lightboxPopup.bodyText = 'Your item is marked "pending" while it is being confirmed.<br><br>' +
+                lightboxPopup.bodyText = 'Your item is marked "pending" while the transfer is being confirmed.<br><br>' +
                 'Confirmations usually take about 90 seconds.';
                 lightboxPopup.button1text = "CLOSE";
                 lightboxPopup.button1method = function() {
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index de9c62c197..4b0166425a 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -27,7 +27,6 @@ Item {
     property string referrerURL: (Account.metaverseServerURL + "/marketplace?");
     readonly property int additionalDropdownHeight: usernameDropdown.height - myUsernameButton.anchors.bottomMargin;
     property alias usernameDropdownVisible: usernameDropdown.visible;
-    property bool messagesWaiting: false;
 
     height: mainContainer.height + additionalDropdownHeight;
 
@@ -38,7 +37,6 @@ Item {
             if (walletStatus === 0) {
                 sendToParent({method: "needsLogIn"});
             } else if (walletStatus === 5) {
-                Commerce.getAvailableUpdates();
                 Commerce.getSecurityImage();
             } else if (walletStatus > 5) {
                 console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus);
@@ -59,14 +57,6 @@ Item {
                 securityImage.source = "image://security/securityImage";
             }
         }
-
-        onAvailableUpdatesResult: {
-            if (result.status !== 'success') {
-                console.log("Failed to get Available Updates", result.data.message);
-            } else {
-                root.messagesWaiting = result.data.updates.length > 0;
-            }
-        }
     }
 
     Component.onCompleted: {
@@ -118,50 +108,6 @@ Item {
             anchors.right: securityImage.left;
             anchors.rightMargin: 6;
 
-            Rectangle {
-                id: myPurchasesLink;
-                anchors.right: myUsernameButton.left;
-                anchors.rightMargin: 8;
-                anchors.verticalCenter: parent.verticalCenter;
-                height: 40;
-                width: myPurchasesText.paintedWidth + 10;
-
-                RalewaySemiBold {
-                    id: myPurchasesText;
-                    text: "Inventory";
-                    // Text size
-                    size: 18;
-                    // Style
-                    color: hifi.colors.blueAccent;
-                    horizontalAlignment: Text.AlignHCenter;
-                    verticalAlignment: Text.AlignVCenter;
-                    // Anchors
-                    anchors.centerIn: parent;
-                }
-
-                MouseArea {
-                    anchors.fill: parent;
-                    hoverEnabled: enabled;
-                    onClicked: {
-                        sendToParent({ method: 'header_goToPurchases', hasUpdates: root.messagesWaiting });
-                    }
-                    onEntered: myPurchasesText.color = hifi.colors.blueHighlight;
-                    onExited: myPurchasesText.color = hifi.colors.blueAccent;
-                }
-            }
-
-            Rectangle {
-                id: messagesWaitingLight;
-                visible: root.messagesWaiting;
-                anchors.right: myPurchasesLink.left;
-                anchors.rightMargin: -2;
-                anchors.verticalCenter: parent.verticalCenter;
-                height: 10;
-                width: height;
-                radius: height/2;
-                color: "red";
-            }
-
             TextMetrics {
                 id: textMetrics;
                 font.family: "Raleway"
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
index 0a5c3e8053..bb4bb624bc 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
@@ -73,6 +73,10 @@ Item {
         }
 
         onTransferAssetToNodeResult: {
+            if (!root.visible) {
+                return;
+            }
+
             root.isCurrentlySendingAsset = false;
 
             if (result.status === 'success') {
@@ -92,6 +96,10 @@ Item {
         }
 
         onTransferAssetToUsernameResult: {
+            if (!root.visible) {
+                return;
+            }
+
             root.isCurrentlySendingAsset = false;
 
             if (result.status === 'success') {
@@ -1309,13 +1317,13 @@ Item {
 
         Rectangle {
             anchors.top: parent.top;
-            anchors.topMargin: root.assetName === "" ? 15 : 150;
+            anchors.topMargin: root.assetName === "" ? 15 : 125;
             anchors.left: parent.left;
             anchors.leftMargin: root.assetName === "" ? 15 : 50;
             anchors.right: parent.right;
             anchors.rightMargin: root.assetName === "" ? 15 : 50;
             anchors.bottom: parent.bottom;
-            anchors.bottomMargin: root.assetName === "" ? 15 : 240;
+            anchors.bottomMargin: root.assetName === "" ? 15 : 125;
             color: "#FFFFFF";
 
             RalewaySemiBold {
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index eeb9ac3c54..d13473af22 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -345,6 +345,7 @@ Item {
 
             Rectangle {
                 id: permissionExplanationCard;
+                visible: false;
                 anchors.left: parent.left;
                 anchors.leftMargin: 30;
                 anchors.top: parent.top;
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 655af79e68..eeb98eeb8c 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -19,7 +19,6 @@ import "../../../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 import "../wallet" as HifiWallet
 import "../common" as HifiCommerceCommon
-import "../inspectionCertificate" as HifiInspectionCertificate
 import "../common/sendAsset" as HifiSendAsset
 import "../.." as HifiCommon
 
@@ -118,19 +117,6 @@ Rectangle {
         }
     }
 
-    HifiInspectionCertificate.InspectionCertificate {
-        id: inspectionCertificate;
-        z: 998;
-        visible: false;
-        anchors.fill: parent;
-
-        Connections {
-            onSendToScript: {
-                sendToScript(message);
-            }
-        }
-    }
-
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         z: 999;
@@ -200,11 +186,6 @@ Rectangle {
                     lightboxPopup.button1method = function() {
                         lightboxPopup.visible = false;
                     }
-                    lightboxPopup.button2text = "GO TO WALLET";
-                    lightboxPopup.button2method = function() {
-                        sendToScript({method: 'purchases_openWallet'});
-                        lightboxPopup.visible = false;
-                    };
                     lightboxPopup.visible = true;
                 } else {
                     sendToScript(msg);
@@ -627,8 +608,6 @@ Rectangle {
                                 sendToScript({ method: 'purchases_updateWearables' });
                             }
                         } else if (msg.method === 'purchases_itemCertificateClicked') {
-                            inspectionCertificate.visible = true;
-                            inspectionCertificate.isLightbox = true;
                             sendToScript(msg);
                         } else if (msg.method === "showInvalidatedLightbox") {
                             lightboxPopup.titleText = "Item Invalidated";
@@ -641,7 +620,7 @@ Rectangle {
                             lightboxPopup.visible = true;
                         } else if (msg.method === "showPendingLightbox") {
                             lightboxPopup.titleText = "Item Pending";
-                            lightboxPopup.bodyText = 'Your item is marked "pending" while your purchase is being confirmed. ' +
+                            lightboxPopup.bodyText = 'Your item is marked "pending" while the transfer is being confirmed. ' +
                             "Usually, purchases take about 90 seconds to confirm.";
                             lightboxPopup.button1text = "CLOSE";
                             lightboxPopup.button1method = function() {
@@ -1066,9 +1045,6 @@ Rectangle {
                 titleBarContainer.referrerURL = message.referrerURL || "";
                 filterBar.text = message.filterText ? message.filterText : "";
             break;
-            case 'inspectionCertificate_setCertificateId':
-                inspectionCertificate.fromScript(message);
-            break;
             case 'purchases_showMyItems':
                 root.isShowingMyItems = true;
             break;
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index ee86844aaa..a958e62aad 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -21,6 +21,7 @@ import "../common" as HifiCommerceCommon
 import "../common/sendAsset"
 import "../.." as HifiCommon
 import "../purchases" as HifiPurchases
+import "../inspectionCertificate" as HifiInspectionCertificate
 
 Rectangle {
     HifiConstants { id: hifi; }
@@ -30,7 +31,6 @@ Rectangle {
     property string activeView: "initialize";
     property bool keyboardRaised: false;
     property bool isPassword: false;
-    property bool limitedCommerce: true;
 
     anchors.fill: (typeof parent === undefined) ? undefined : parent;
 
@@ -67,6 +67,7 @@ Rectangle {
             } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
                     root.activeView = "walletInventory";
+                    Commerce.getAvailableUpdates();
                     Commerce.getSecurityImage();
                 }
             } else {
@@ -88,6 +89,14 @@ Rectangle {
                 titleBarSecurityImage.source = "image://security/securityImage";
             }
         }
+
+        onAvailableUpdatesResult: {
+            if (result.status !== 'success') {
+                console.log("Failed to get Available Updates", result.data.message);
+            } else {
+                exchangeMoneyButtonContainer.messagesWaiting = result.data.updates.length > 0;
+            }
+        }
     }
 
     HifiCommerceCommon.CommerceLightbox {
@@ -339,6 +348,10 @@ Rectangle {
                 if (msg.method === 'transactionHistory_usernameLinkClicked') {
                     userInfoViewer.url = msg.usernameLink;
                     userInfoViewer.visible = true;
+                } else if (msg.method === 'goToPurchases_fromWalletHome') {
+                    root.activeView = "walletInventory";
+                    walletInventory.isShowingMyItems = false;
+                    tabButtonsContainer.resetTabButtonColors();
                 } else {
                     sendToScript(msg);
                 }
@@ -346,7 +359,20 @@ Rectangle {
         }
     }
 
-     HifiPurchases.Purchases {
+    HifiInspectionCertificate.InspectionCertificate {
+        id: inspectionCertificate;
+        z: 998;
+        visible: false;
+        anchors.fill: parent;
+
+        Connections {
+            onSendToScript: {
+                sendToScript(message);
+            }
+        }
+    }
+
+    HifiPurchases.Purchases {
         id: walletInventory;
         visible: root.activeView === "walletInventory";
         anchors.top: titleBarContainer.bottom;
@@ -355,10 +381,15 @@ Rectangle {
         anchors.right: parent.right;
         Connections {
             onSendToScript: {
-                sendToScript(message);
+                if (message.method === 'purchases_itemCertificateClicked') {
+                    inspectionCertificate.visible = true;
+                    inspectionCertificate.isLightbox = true;
+                    sendToScript(message);
+                } else {
+                    sendToScript(message);
+                }
             }
         }
-
     }
 
     HifiCommon.RootHttpRequest {
@@ -480,7 +511,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
+                color: WalletScriptingInterface.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
             }
 
             RalewaySemiBold {
@@ -495,7 +526,7 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
+                color: WalletScriptingInterface.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
@@ -504,7 +535,7 @@ Rectangle {
             MouseArea {
                 id: walletHomeTabMouseArea;
                 anchors.fill: parent;
-                enabled: !root.limitedCommerce;
+                enabled: !WalletScriptingInterface.limitedCommerce;
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "walletHome";
@@ -518,6 +549,8 @@ Rectangle {
         // "EXCHANGE MONEY" tab button
         Rectangle {
             id: exchangeMoneyButtonContainer;
+            property bool messagesWaiting: false;
+
             visible: !walletSetup.visible;
             color: root.activeView === "walletInventory" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
@@ -535,7 +568,20 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.activeView === "walletInventory" || inventoryTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+            }
+
+            Rectangle {
+                id: messagesWaitingLight;
+                visible: parent.messagesWaiting;
+                anchors.right: exchangeMoneyTabIcon.left;
+                anchors.rightMargin: -4;
+                anchors.top: exchangeMoneyTabIcon.top;
+                anchors.topMargin: 16;
+                height: 10;
+                width: height;
+                radius: height/2;
+                color: "red";
             }
 
             RalewaySemiBold {
@@ -550,7 +596,7 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.activeView === "walletInventory" || walletHomeTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
+                color: root.activeView === "walletInventory" || inventoryTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
@@ -592,7 +638,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.topMargin: -2;
                 // Style
-                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
+                color: WalletScriptingInterface.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
             }
 
             RalewaySemiBold {
@@ -607,7 +653,7 @@ Rectangle {
                 anchors.right: parent.right;
                 anchors.rightMargin: 4;
                 // Style
-                color: root.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
+                color: WalletScriptingInterface.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "sendMoney" || sendMoneyTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
                 wrapMode: Text.WordWrap;
                 // Alignment
                 horizontalAlignment: Text.AlignHCenter;
@@ -617,7 +663,7 @@ Rectangle {
             MouseArea {
                 id: sendMoneyTabMouseArea;
                 anchors.fill: parent;
-                enabled: !root.limitedCommerce;
+                enabled: !WalletScriptingInterface.limitedCommerce;
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "sendMoney";
@@ -825,17 +871,26 @@ Rectangle {
             break;
             case 'http.response':
                 http.handleHttpResponse(message);
+                // Duplicate handler is required because we don't track referrer for `http`
+                walletInventory.fromScript(message);
             break;
             case 'palIsStale':
             case 'avatarDisconnected':
                 // Because we don't have "channels" for sending messages to a specific QML object, the messages are broadcast to all QML Items. If an Item of yours happens to be visible when some script sends a message with a method you don't expect, you'll get "Unrecognized message..." logs.
             break;
-            case 'setLimitedCommerce':
-                root.limitedCommerce = message.limitedCommerce;
-                break;
-            default:
-                // HRS FIXME console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
+            case 'inspectionCertificate_setCertificateId':
+                inspectionCertificate.fromScript(message);
+            break;
+            case 'updatePurchases':
+            case 'purchases_showMyItems':
+            case 'updateConnections':
+            case 'selectRecipient':
+            case 'updateSelectedRecipientUsername':
+            case 'updateWearables':
                 walletInventory.fromScript(message);
+            break;
+            default:
+                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
         }
     }
     signal sendToScript(var message);
@@ -881,7 +936,9 @@ Rectangle {
             root.activeView = "initialize";
             Commerce.getWalletStatus();
         } else if (msg.referrer === 'purchases') {
-            sendToScript({method: 'goToPurchases'});
+            root.activeView = "walletInventory";
+            walletInventory.isShowingMyItems = false;
+            tabButtonsContainer.resetTabButtonColors();
         } else if (msg.referrer === 'marketplace cta' || msg.referrer === 'mainPage') {
             sendToScript({method: 'goToMarketplaceMainPage', itemId: msg.referrer});
         } else {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 3f354f64b5..70c25ce823 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3154,7 +3154,7 @@ void Application::onDesktopRootContextCreated(QQmlContext* surfaceContext) {
     surfaceContext->setContextProperty("AvatarInputs", AvatarInputs::getInstance());
     surfaceContext->setContextProperty("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
     surfaceContext->setContextProperty("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
-    surfaceContext->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
+    surfaceContext->setContextProperty("WalletScriptingInterface", DependencyManager::get<WalletScriptingInterface>().data());
     surfaceContext->setContextProperty("HiFiAbout", AboutUtil::getInstance());
     surfaceContext->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
 
@@ -6876,7 +6876,7 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEnginePointe
     scriptEngine->registerGlobalObject("AvatarInputs", AvatarInputs::getInstance());
     scriptEngine->registerGlobalObject("Selection", DependencyManager::get<SelectionScriptingInterface>().data());
     scriptEngine->registerGlobalObject("ContextOverlay", DependencyManager::get<ContextOverlayInterface>().data());
-    scriptEngine->registerGlobalObject("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
+    scriptEngine->registerGlobalObject("WalletScriptingInterface", DependencyManager::get<WalletScriptingInterface>().data());
     scriptEngine->registerGlobalObject("AddressManager", DependencyManager::get<AddressManager>().data());
     scriptEngine->registerGlobalObject("HifiAbout", AboutUtil::getInstance());
     scriptEngine->registerGlobalObject("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
@@ -7881,6 +7881,10 @@ void Application::loadAvatarBrowser() const {
     auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
     // construct the url to the marketplace item
     QString url = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace?category=avatars";
+    if (DependencyManager::get<WalletScriptingInterface>()->getLimitedCommerce()) {
+        url += "&isFree=1";
+    }
+
     QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
     tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
     DependencyManager::get<HMDScriptingInterface>()->openTablet();
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 67303f2a9b..f4bd7a84b3 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -240,7 +240,6 @@ QString transactionString(const QJsonObject& valueObject) {
     return result;
 }
 
-static const QString MARKETPLACE_ITEMS_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace/items/";
 void Ledger::historySuccess(QNetworkReply* reply) {
     // here we send a historyResult with some extra stuff in it
     // Namely, the styled text we'd like to show.  The issue is the
diff --git a/interface/src/scripting/WalletScriptingInterface.h b/interface/src/scripting/WalletScriptingInterface.h
index c4ab0da851..8aebb68a47 100644
--- a/interface/src/scripting/WalletScriptingInterface.h
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -36,29 +36,29 @@ public:
  * @hifi-client-entity
  *
  * @property {number} walletStatus
+ * @property {bool} limitedCommerce
  */
 class WalletScriptingInterface : public QObject, public Dependency {
     Q_OBJECT
     SINGLETON_DEPENDENCY
-
     Q_PROPERTY(uint walletStatus READ getWalletStatus WRITE setWalletStatus NOTIFY walletStatusChanged)
-    Q_PROPERTY(bool limitedCommerce READ getLimitedCommerce WRITE setLimitedCommerce)
+    Q_PROPERTY(bool limitedCommerce READ getLimitedCommerce WRITE setLimitedCommerce NOTIFY limitedCommerceChanged)
 
 public:
 
     /**jsdoc
-     * @function Wallet.refreshWalletStatus
+     * @function WalletScriptingInterface.refreshWalletStatus
      */
     Q_INVOKABLE void refreshWalletStatus();
 
     /**jsdoc
-     * @function Wallet.getWalletStatus
+     * @function WalletScriptingInterface.getWalletStatus
      * @returns {number}
      */
     Q_INVOKABLE uint getWalletStatus() { return _walletStatus; }
 
     /**jsdoc
-     * @function Wallet.proveAvatarEntityOwnershipVerification
+     * @function WalletScriptingInterface.proveAvatarEntityOwnershipVerification
      * @param {Uuid} entityID
      */
     Q_INVOKABLE void proveAvatarEntityOwnershipVerification(const QUuid& entityID);
@@ -67,32 +67,38 @@ public:
     //     scripts could cause the Wallet to incorrectly report its status.
     void setWalletStatus(const uint& status);
 
-  bool getLimitedCommerce() { return _limitedCommerce; }
-  void setLimitedCommerce(bool isLimited) { _limitedCommerce = isLimited; }
+    bool getLimitedCommerce() { return _limitedCommerce; }
+    void setLimitedCommerce(bool isLimited) { _limitedCommerce = isLimited; }
 
 signals:
 
     /**jsdoc
-     * @function Wallet.walletStatusChanged
+     * @function WalletScriptingInterface.walletStatusChanged
      * @returns {Signal}
      */
     void walletStatusChanged();
 
     /**jsdoc
-     * @function Wallet.walletNotSetup
+     * @function WalletScriptingInterface.limitedCommerceChanged
+     * @returns {Signal}
+     */
+    void limitedCommerceChanged();
+
+    /**jsdoc
+     * @function WalletScriptingInterface.walletNotSetup
      * @returns {Signal}
      */
     void walletNotSetup();
 
     /**jsdoc
-     * @function Wallet.ownershipVerificationSuccess
+     * @function WalletScriptingInterface.ownershipVerificationSuccess
      * @param {Uuid} entityID
      * @returns {Signal}
      */
     void ownershipVerificationSuccess(const QUuid& entityID);
 
     /**jsdoc
-     * @function Wallet.ownershipVerificationFailed
+     * @function WalletScriptingInterface.ownershipVerificationFailed
      * @param {Uuid} entityID
      * @returns {Signal}
      */
diff --git a/interface/src/ui/overlays/Web3DOverlay.cpp b/interface/src/ui/overlays/Web3DOverlay.cpp
index 1a1bd00655..f13d25f22c 100644
--- a/interface/src/ui/overlays/Web3DOverlay.cpp
+++ b/interface/src/ui/overlays/Web3DOverlay.cpp
@@ -96,7 +96,6 @@ Web3DOverlay::Web3DOverlay() {
     _webSurface->getSurfaceContext()->setContextProperty("GlobalServices", AccountServicesScriptingInterface::getInstance()); // DEPRECATED - TO BE REMOVED
     _webSurface->getSurfaceContext()->setContextProperty("AccountServices", AccountServicesScriptingInterface::getInstance());
     _webSurface->getSurfaceContext()->setContextProperty("AddressManager", DependencyManager::get<AddressManager>().data());
-    _webSurface->getSurfaceContext()->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
 }
 
 Web3DOverlay::Web3DOverlay(const Web3DOverlay* Web3DOverlay) :
@@ -271,8 +270,8 @@ void Web3DOverlay::setupQmlSurface(bool isTablet) {
         _webSurface->getSurfaceContext()->setContextProperty("Web3DOverlay", this);
         _webSurface->getSurfaceContext()->setContextProperty("Window", DependencyManager::get<WindowScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("Reticle", qApp->getApplicationCompositor().getReticleInterface());
-        _webSurface->getSurfaceContext()->setContextProperty("Wallet", DependencyManager::get<WalletScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("HiFiAbout", AboutUtil::getInstance());
+        _webSurface->getSurfaceContext()->setContextProperty("WalletScriptingInterface", DependencyManager::get<WalletScriptingInterface>().data());
         _webSurface->getSurfaceContext()->setContextProperty("ResourceRequestObserver", DependencyManager::get<ResourceRequestObserver>().data());
 
         // Override min fps for tablet UI, for silky smooth scrolling
diff --git a/scripts/system/avatarapp.js b/scripts/system/avatarapp.js
index ece35acce7..2f05b1b337 100644
--- a/scripts/system/avatarapp.js
+++ b/scripts/system/avatarapp.js
@@ -159,8 +159,8 @@ var selectedAvatarEntityGrabbable = false;
 var selectedAvatarEntityID = null;
 var grabbedAvatarEntityChangeNotifier = null;
 
-var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/purchases/Purchases.qml";
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
+var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/wallet/Wallet.qml";
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
 var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("html/js/marketplacesInject.js");
 
 function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml.
@@ -285,9 +285,9 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
     case 'navigate':
         var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system")
         if(message.url.indexOf('app://') === 0) {
-            if(message.url === 'app://marketplace') {
+            if (message.url === 'app://marketplace') {
                 tablet.gotoWebScreen(MARKETPLACE_URL, MARKETPLACES_INJECT_SCRIPT_URL);
-            } else if(message.url === 'app://purchases') {
+            } else if (message.url === 'app://purchases') {
                 tablet.pushOntoStack(MARKETPLACE_PURCHASES_QML_PATH);
             }
 
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 58f39ca54c..353145035e 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -11,15 +11,15 @@
 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-/* global getConnectionData */
+/* global getConnectionData getControllerWorldLocation openLoginWindow WalletScriptingInterface */
 
 (function () { // BEGIN LOCAL_SCOPE
 Script.include("/~/system/libraries/accountUtils.js");
 Script.include("/~/system/libraries/connectionUtils.js");
 var AppUi = Script.require('appUi');
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
-
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" +
+    (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
 
 // BEGIN AVATAR SELECTOR LOGIC
 var UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6 };
@@ -48,7 +48,6 @@ ExtendedOverlay.prototype.editOverlay = function (properties) { // change displa
 function color(selected, hovering) {
     var base = hovering ? HOVER_COLOR : selected ? SELECTED_COLOR : UNSELECTED_COLOR;
     function scale(component) {
-        var delta = 0xFF - component;
         return component;
     }
     return { red: scale(base.red), green: scale(base.green), blue: scale(base.blue) };
@@ -105,7 +104,8 @@ ExtendedOverlay.unHover = function () { // calls hover(false) on lastHoveringId
 // hit(overlay) on the one overlay intersected by pickRay, if any.
 // noHit() if no ExtendedOverlay was intersected (helps with hover)
 ExtendedOverlay.applyPickRay = function (pickRay, hit, noHit) {
-    var pickedOverlay = Overlays.findRayIntersection(pickRay); // Depends on nearer coverOverlays to extend closer to us than farther ones.
+    // Depends on nearer coverOverlays to extend closer to us than farther ones.
+    var pickedOverlay = Overlays.findRayIntersection(pickRay);
     if (!pickedOverlay.intersects) {
         if (noHit) {
             return noHit();
@@ -131,6 +131,7 @@ function addAvatarNode(id) {
 }
 
 var pingPong = true;
+var OVERLAY_SCALE = 0.032;
 function updateOverlays() {
     var eye = Camera.position;
     AvatarList.getAvatarIdentifiers().forEach(function (id) {
@@ -148,7 +149,8 @@ function updateOverlays() {
         var target = avatar.position;
         var distance = Vec3.distance(target, eye);
         var offset = 0.2;
-        var diff = Vec3.subtract(target, eye); // get diff between target and eye (a vector pointing to the eye from avatar position)
+        // get diff between target and eye (a vector pointing to the eye from avatar position)
+        var diff = Vec3.subtract(target, eye);
         var headIndex = avatar.getJointIndex("Head"); // base offset on 1/2 distance from hips to head if we can
         if (headIndex > 0) {
             offset = avatar.getAbsoluteJointTranslationInObjectFrame(headIndex).y / 2;
@@ -164,7 +166,7 @@ function updateOverlays() {
         overlay.editOverlay({
             color: color(ExtendedOverlay.isSelected(id), overlay.hovering),
             position: target,
-            dimensions: 0.032 * distance
+            dimensions: OVERLAY_SCALE * distance
         });
     });
     pingPong = !pingPong;
@@ -380,6 +382,23 @@ function onUsernameChanged() {
         Settings.setValue("wallet/autoLogout", false);
         Settings.setValue("wallet/savedUsername", "");
     }
+}    
+    
+var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
+var METAVERSE_SERVER_URL = Account.metaverseServerURL;
+var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?"; // Append "?" to signal injected script that it's the initial page.
+function openMarketplace(optionalItemOrUrl) {
+    // This is a bit of a kluge, but so is the whole file.
+    // If given a whole path, use it with no cta.
+    // If given an id, build the appropriate url and use the id as the cta.
+    // Otherwise, use home and 'marketplace cta'.
+    // AND... if call onMarketplaceOpen to setupWallet if we need to.
+    var url = optionalItemOrUrl || MARKETPLACE_URL_INITIAL;
+    // If optionalItemOrUrl contains the metaverse base, then it's a url, not an item id.
+    if (optionalItemOrUrl && optionalItemOrUrl.indexOf(METAVERSE_SERVER_URL) === -1) {
+        url = MARKETPLACE_URL + '/items/' + optionalItemOrUrl;
+    }
+    ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
 }
 
 // Function Name: fromQml()
@@ -387,8 +406,6 @@ function onUsernameChanged() {
 // Description:
 //   -Called when a message is received from SpectatorCamera.qml. The "message" argument is what is sent from the QML
 //    in the format "{method, params}", like json-rpc. See also sendToQml().
-var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/purchases/Purchases.qml";
-var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js");
 function fromQml(message) {
     switch (message.method) {
     case 'passphrasePopup_cancelClicked':
@@ -422,10 +439,6 @@ function fromQml(message) {
     case 'transactionHistory_linkClicked':
         ui.open(message.marketplaceLink, MARKETPLACES_INJECT_SCRIPT_URL);
         break;
-    case 'goToPurchases_fromWalletHome':
-    case 'goToPurchases':
-        ui.open(MARKETPLACE_PURCHASES_QML_PATH);
-        break;
     case 'goToMarketplaceMainPage':
         ui.open(MARKETPLACE_URL, MARKETPLACES_INJECT_SCRIPT_URL);
         break;
@@ -450,22 +463,20 @@ function fromQml(message) {
         removeOverlays();
         break;
     case 'sendAsset_sendPublicly':
-        if (message.assetName === "") {
-            deleteSendMoneyParticleEffect();
-            sendMoneyRecipient = message.recipient;
-            var amount = message.amount;
-            var props = SEND_MONEY_PARTICLE_PROPERTIES;
-            props.parentID = MyAvatar.sessionUUID;
-            props.position = MyAvatar.position;
-            props.position.y += 0.2;
-            if (message.effectImage) {
-                props.textures = message.effectImage;
-            }
-            sendMoneyParticleEffect = Entities.addEntity(props, true);
-            particleEffectTimestamp = Date.now();
-            updateSendMoneyParticleEffect();
-            sendMoneyParticleEffectUpdateTimer = Script.setInterval(updateSendMoneyParticleEffect, SEND_MONEY_PARTICLE_TIMER_UPDATE);
+        deleteSendMoneyParticleEffect();
+        sendMoneyRecipient = message.recipient;
+        var props = SEND_MONEY_PARTICLE_PROPERTIES;
+        props.parentID = MyAvatar.sessionUUID;
+        props.position = MyAvatar.position;
+        props.position.y += 0.2;
+        if (message.effectImage) {
+            props.textures = message.effectImage;
         }
+        sendMoneyParticleEffect = Entities.addEntity(props, true);
+        particleEffectTimestamp = Date.now();
+        updateSendMoneyParticleEffect();
+        sendMoneyParticleEffectUpdateTimer =
+            Script.setInterval(updateSendMoneyParticleEffect, SEND_MONEY_PARTICLE_TIMER_UPDATE);
         break;
     case 'transactionHistory_goToBank':
         if (Account.metaverseServerURL.indexOf("staging") >= 0) {
@@ -474,6 +485,46 @@ function fromQml(message) {
             Window.location = "hifi://BankOfHighFidelity";
         }
         break;
+    case 'purchases_updateWearables':
+        var currentlyWornWearables = [];
+        var ATTACHMENT_SEARCH_RADIUS = 100; // meters (just in case)
+
+        var nearbyEntities = Entities.findEntitiesByType('Model', MyAvatar.position, ATTACHMENT_SEARCH_RADIUS);
+
+        for (var i = 0; i < nearbyEntities.length; i++) {
+            var currentProperties = Entities.getEntityProperties(
+                nearbyEntities[i], ['certificateID', 'editionNumber', 'parentID']
+            );
+            if (currentProperties.parentID === MyAvatar.sessionUUID) {
+                currentlyWornWearables.push({
+                    entityID: nearbyEntities[i],
+                    entityCertID: currentProperties.certificateID,
+                    entityEdition: currentProperties.editionNumber
+                });
+            }
+        }
+
+        ui.tablet.sendToQml({ method: 'updateWearables', wornWearables: currentlyWornWearables });
+        break;
+    case 'purchases_availableUpdatesReceived':
+        shouldShowDot = message.numUpdates > 0;
+        ui.messagesWaiting(shouldShowDot && !ui.isOpen);
+        break;
+    case 'purchases_walletNotSetUp':
+        ui.tablet.sendToQml({
+            method: 'updateWalletReferrer',
+            referrer: "purchases"
+        });
+        break;
+    case 'purchases_openGoTo':
+        ui.open("hifi/tablet/TabletAddressDialog.qml");
+        break;
+    case 'purchases_itemInfoClicked':
+        var itemId = message.itemId;
+        if (itemId && itemId !== "") {
+            openMarketplace(itemId);
+        }
+        break;
     case 'http.request':
         // Handled elsewhere, don't log.
         break;
@@ -482,23 +533,28 @@ function fromQml(message) {
     }
 }
 
+var isWired = false;
 function walletOpened() {
     Users.usernameFromIDReply.connect(usernameFromIDReply);
     Controller.mousePressEvent.connect(handleMouseEvent);
     Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
     triggerMapping.enable();
     triggerPressMapping.enable();
+    isWired = true;
     shouldShowDot = false;
     ui.messagesWaiting(shouldShowDot);
-    ui.sendMessage({method: 'setLimitedCommerce', limitedCommerce: Wallet.limitedCommerce}); // HRS FIXME Wallet should be accessible in qml. Why isn't it?
 }
 
 function walletClosed() {
     off();
 }
 
-function notificationDataProcessPage(data) {
-    return data.data.updates; // HRS FIXME .history;
+function notificationDataProcessPageUpdates(data) {
+    return data.data.updates;
+}
+
+function notificationDataProcessPageHistory(data) {
+    return data.data.history;
 }
 
 var shouldShowDot = false;
@@ -511,7 +567,7 @@ function notificationPollCallbackUpdates(updatesArray) {
         if (!ui.notificationInitialCallbackMade) {
             message = updatesArray.length + " of your purchased items " +
                 (updatesArray.length === 1 ? "has an update " : "have updates ") +
-                "available. Open MARKET to update.";
+                "available. Open WALLET to update.";
             ui.notificationDisplayBanner(message);
 
             ui.notificationPollCaresAboutSince = true;
@@ -519,13 +575,13 @@ function notificationPollCallbackUpdates(updatesArray) {
             for (var i = 0; i < updatesArray.length; i++) {
                 message = "Update available for \"" +
                     updatesArray[i].base_item_title + "\"." +
-                    "Open MARKET to update.";
+                    "Open WALLET to update.";
                 ui.notificationDisplayBanner(message);
             }
         }
     }
 }
-function notificationPollCallback(historyArray) {
+function notificationPollCallbackHistory(historyArray) {
     if (!ui.isOpen) {
         var notificationCount = historyArray.length;
         shouldShowDot = shouldShowDot || notificationCount > 0;
@@ -548,7 +604,12 @@ function notificationPollCallback(historyArray) {
     }
 }
 
-function isReturnedDataEmpty(data) {
+function isReturnedDataEmptyUpdates(data) {
+    var historyArray = data.data.history;
+    return historyArray.length === 0;
+}
+
+function isReturnedDataEmptyHistory(data) {
     var historyArray = data.data.history;
     return historyArray.length === 0;
 }
@@ -585,6 +646,7 @@ function uninstallMarketplaceItemTester() {
 
 var BUTTON_NAME = "ASSETS";
 var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
+var NOTIFICATION_POLL_TIMEOUT = 300000;
 var ui;
 function startup() {
     ui = new AppUi({
@@ -595,13 +657,20 @@ function startup() {
         onOpened: walletOpened,
         onClosed: walletClosed,
         onMessage: fromQml,
-        // How are we going to handle two polls when --limitedCommerce is false?
-        notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10", // HRS FIXME "/api/v1/commerce/history?per_page=10",
+/* Gotta re-add all this stuff once I get it working
+        notificationPollEndpoint: ["/api/v1/commerce/available_updates?per_page=10", "/api/v1/commerce/history?per_page=10"],
+        notificationPollTimeoutMs: [NOTIFICATION_POLL_TIMEOUT, NOTIFICATION_POLL_TIMEOUT],
+        notificationDataProcessPage: [notificationDataProcessPageUpdates, notificationDataProcessPageHistory],
+        notificationPollCallback: [notificationPollCallbackUpdates, notificationPollCallbackHistory],
+        notificationPollStopPaginatingConditionMet: [isReturnedDataEmptyUpdates, isReturnedDataEmptyHistory],
+        notificationPollCaresAboutSince: [false, true]
+*/
+        notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
         notificationPollTimeoutMs: 300000,
-        notificationDataProcessPage: notificationDataProcessPage,
+        notificationDataProcessPage: notificationDataProcessPageUpdates,
         notificationPollCallback: notificationPollCallbackUpdates,
-        notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        notificationPollCaresAboutSince: false // HRS FIXME true
+        notificationPollStopPaginatingConditionMet: isReturnedDataEmptyUpdates,
+        notificationPollCaresAboutSince: false
     });
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     installMarketplaceItemTester();
@@ -609,11 +678,13 @@ function startup() {
 
 var isUpdateOverlaysWired = false;
 function off() {
-    Users.usernameFromIDReply.disconnect(usernameFromIDReply);
-    Controller.mousePressEvent.disconnect(handleMouseEvent);
-    Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
-    triggerMapping.disable();
-    triggerPressMapping.disable();
+    if (isWired) {
+        Users.usernameFromIDReply.disconnect(usernameFromIDReply);
+        Controller.mousePressEvent.disconnect(handleMouseEvent);
+        Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
+        triggerMapping.disable();
+        triggerPressMapping.disable();
+    }
 
     if (isUpdateOverlaysWired) {
         Script.update.disconnect(updateOverlays);
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 6425806771..ee1f5ecbec 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -193,7 +193,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", {
     visible: false
 });
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
 var marketplaceWindow = new OverlayWebWindow({
     title: 'Marketplace',
     source: "about:blank",
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 43fd9ab935..fd228e2596 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -60,7 +60,7 @@
         );
 
         // Footer.
-        var isInitialHiFiPage = location.href === marketplaceBaseURL + "/marketplace?";
+        var isInitialHiFiPage = location.href === (marketplaceBaseURL + "/marketplace" + (limitedCommerce ? "?isFree=1" : "?"));
         $("body").append(
             '<div id="marketplace-navigation">' +
                 (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
@@ -72,7 +72,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?");
+            (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?") + (limitedCommerce ? "isFree=1" : "");
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(JSON.stringify({
@@ -93,7 +93,7 @@
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
         $('#exploreHifiMarketplace').on('click', function () {
-            window.location = marketplaceBaseURL + "/marketplace";
+            window.location = marketplaceBaseURL + "/marketplace" + (limitedCommerce ? "?isFree=1" : "?");
         });
     }
 
@@ -196,43 +196,6 @@
         }
     }
 
-    function maybeAddPurchasesButton() {
-        if (userIsLoggedIn) {
-            // Why isn't this an id?! This really shouldn't be a class on the website, but it is.
-            var navbarBrandElement = document.getElementsByClassName('navbar-brand')[0];
-            var purchasesElement = document.createElement('a');
-            var dropDownElement = document.getElementById('user-dropdown');
-
-            $('#user-dropdown').find('.username')[0].style = "max-width:80px;white-space:nowrap;overflow:hidden;" +
-                "text-overflow:ellipsis;display:inline-block;position:relative;top:4px;";
-            $('#user-dropdown').find('.caret')[0].style = "position:relative;top:-3px;";
-
-            purchasesElement.id = "purchasesButton";
-            purchasesElement.setAttribute('href', "#");
-            purchasesElement.innerHTML = "";
-            if (messagesWaiting) {
-                purchasesElement.innerHTML += "<span style='width:10px;height:10px;background-color:red;border-radius:50%;display:inline-block;'></span> ";
-            }
-            purchasesElement.innerHTML += "My Purchases";
-            // FRONTEND WEBDEV RANT: The username dropdown should REALLY not be programmed to be on the same
-            //     line as the search bar, overlaid on top of the search bar, floated right, and then relatively bumped up using "top:-50px".
-            $('.navbar-brand').css('margin-right', '10px');
-            purchasesElement.style = "height:100%;margin-top:18px;font-weight:bold;float:right;margin-right:" + (dropDownElement.offsetWidth + 30) +
-                "px;position:relative;z-index:999;";
-            navbarBrandElement.parentNode.insertAdjacentElement('beforeend', purchasesElement);
-            if (limitedCommerce) {
-                $('#purchasesButton').css('display', 'none');
-            }
-            $('#purchasesButton').on('click', function () {
-                EventBridge.emitWebEvent(JSON.stringify({
-                    type: "PURCHASES",
-                    referrerURL: window.location.href,
-                    hasUpdates: messagesWaiting
-                }));
-            });
-        }
-    }
-
     function changeDropdownMenu() {
         var logInOrOutButton = document.createElement('a');
         logInOrOutButton.id = "logInOrOutButton";
@@ -409,7 +372,6 @@
                 // Try this here in case it works (it will if the user just pressed the "back" button,
                 //     since that doesn't trigger another AJAX request.
                 injectBuyButtonOnMainPage();
-                maybeAddPurchasesButton();
             }
         }
 
@@ -458,7 +420,7 @@
                 if (isUpdating) {
                     purchaseButton.html('UPDATE FOR FREE');
                 } else if (availability !== 'available') {
-                    purchaseButton.html('UNAVAILABLE' + (availability ? ('(' + availability + ')') : ''));
+                    purchaseButton.html('UNAVAILABLE ' + (availability ? ('(' + availability + ')') : ''));
                 } else if (parseInt(cost) > 0 && $('#side-info').find('#buyItemButton').size() === 0) {
                     purchaseButton.html('PURCHASE <span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
                         'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
@@ -476,7 +438,6 @@
                             type);
                     }
                 });
-                maybeAddPurchasesButton();
             }
         }
 
diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js
index d90695c767..2f749656d3 100644
--- a/scripts/system/marketplaces/marketplace.js
+++ b/scripts/system/marketplaces/marketplace.js
@@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js");
 
 var toolIconUrl = Script.resolvePath("../assets/images/tools/");
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
 var marketplaceWindow = new OverlayWebWindow({
     title: "Marketplace",
     source: "about:blank",
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 5b1d5c8897..9f55bade6a 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -10,7 +10,7 @@
 
 /* global Tablet, Script, HMD, UserActivityLogger, Entities, Account, Wallet, ContextOverlay, Settings, Camera, Vec3,
    Quat, MyAvatar, Clipboard, Menu, Grid, Uuid, GlobalServices, openLoginWindow, getConnectionData, Overlays, SoundCache,
-   DesktopPreviewProvider */
+   DesktopPreviewProvider, ResourceRequestObserver */
 /* eslint indent: ["error", 4, { "outerIIFEBody": 0 }] */
 
 var selectionDisplay = null; // for gridTool.js to ignore
@@ -115,10 +115,10 @@ function setTabletVisibleInSecondaryCamera(visibleInSecondaryCam) {
         tabletShouldBeVisibleInSecondaryCamera = Overlays.getProperty(HMD.tabletID, "isVisibleInSecondaryCamera");
     }
 
-    Overlays.editOverlay(HMD.tabletID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
-    Overlays.editOverlay(HMD.homeButtonID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
-    Overlays.editOverlay(HMD.homeButtonHighlightID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
-    Overlays.editOverlay(HMD.tabletScreenID, { isVisibleInSecondaryCamera : visibleInSecondaryCam });
+    Overlays.editOverlay(HMD.tabletID, { isVisibleInSecondaryCamera: visibleInSecondaryCam });
+    Overlays.editOverlay(HMD.homeButtonID, { isVisibleInSecondaryCamera: visibleInSecondaryCam });
+    Overlays.editOverlay(HMD.homeButtonHighlightID, { isVisibleInSecondaryCamera: visibleInSecondaryCam });
+    Overlays.editOverlay(HMD.tabletScreenID, { isVisibleInSecondaryCamera: visibleInSecondaryCam });
 }
 
 function openWallet() {
@@ -137,7 +137,7 @@ function setupWallet(referrer) {
 }
 
 function onMarketplaceOpen(referrer) {
-    var cta = referrer, match;
+    var match;
     if (Account.loggedIn && walletNeedsSetup()) {
         if (referrer === MARKETPLACE_URL_INITIAL) {
             setupWallet('marketplace cta');
@@ -165,6 +165,9 @@ function openMarketplace(optionalItemOrUrl) {
     if (optionalItemOrUrl && optionalItemOrUrl.indexOf(METAVERSE_SERVER_URL) === -1) {
         url = MARKETPLACE_URL + '/items/' + optionalItemOrUrl;
     }
+    if (WalletScriptingInterface.limitedCommerce) {
+        url += "?isFree=1";
+    }
     ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
 }
 
@@ -218,7 +221,7 @@ function onUsernameChanged() {
 }
 
 function walletNeedsSetup() {
-    return Wallet.walletStatus === 1;
+    return WalletScriptingInterface.walletStatus === 1;
 }
 
 function sendCommerceSettings() {
@@ -230,290 +233,11 @@ function sendCommerceSettings() {
             userIsLoggedIn: Account.loggedIn,
             walletNeedsSetup: walletNeedsSetup(),
             metaverseServerURL: Account.metaverseServerURL,
-            messagesWaiting: shouldShowDot,
-            limitedCommerce: Wallet.limitedCommerce
+            limitedCommerce: WalletScriptingInterface.limitedCommerce
         }
     });
 }
 
-// BEGIN AVATAR SELECTOR LOGIC
-var UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6 };
-var SELECTED_COLOR = { red: 0xF3, green: 0x91, blue: 0x29 };
-var HOVER_COLOR = { red: 0xD0, green: 0xD0, blue: 0xD0 };
-
-var overlays = {}; // Keeps track of all our extended overlay data objects, keyed by target identifier.
-
-function ExtendedOverlay(key, type, properties) { // A wrapper around overlays to store the key it is associated with.
-    overlays[key] = this;
-    this.key = key;
-    this.selected = false;
-    this.hovering = false;
-    this.activeOverlay = Overlays.addOverlay(type, properties); // We could use different overlays for (un)selected...
-}
-// Instance methods:
-ExtendedOverlay.prototype.deleteOverlay = function () { // remove display and data of this overlay
-    Overlays.deleteOverlay(this.activeOverlay);
-    delete overlays[this.key];
-};
-
-ExtendedOverlay.prototype.editOverlay = function (properties) { // change display of this overlay
-    Overlays.editOverlay(this.activeOverlay, properties);
-};
-
-function color(selected, hovering) {
-    var base = hovering ? HOVER_COLOR : selected ? SELECTED_COLOR : UNSELECTED_COLOR;
-    function scale(component) {
-        return component;
-    }
-    return { red: scale(base.red), green: scale(base.green), blue: scale(base.blue) };
-}
-// so we don't have to traverse the overlays to get the last one
-var lastHoveringId = 0;
-ExtendedOverlay.prototype.hover = function (hovering) {
-    this.hovering = hovering;
-    if (this.key === lastHoveringId) {
-        if (hovering) {
-            return;
-        }
-        lastHoveringId = 0;
-    }
-    this.editOverlay({ color: color(this.selected, hovering) });
-    if (hovering) {
-        // un-hover the last hovering overlay
-        if (lastHoveringId && lastHoveringId !== this.key) {
-            ExtendedOverlay.get(lastHoveringId).hover(false);
-        }
-        lastHoveringId = this.key;
-    }
-};
-ExtendedOverlay.prototype.select = function (selected) {
-    if (this.selected === selected) {
-        return;
-    }
-
-    this.editOverlay({ color: color(selected, this.hovering) });
-    this.selected = selected;
-};
-// Class methods:
-var selectedId = false;
-ExtendedOverlay.isSelected = function (id) {
-    return selectedId === id;
-};
-ExtendedOverlay.get = function (key) { // answer the extended overlay data object associated with the given avatar identifier
-    return overlays[key];
-};
-ExtendedOverlay.some = function (iterator) { // Bails early as soon as iterator returns truthy.
-    var key;
-    for (key in overlays) {
-        if (iterator(ExtendedOverlay.get(key))) {
-            return;
-        }
-    }
-};
-ExtendedOverlay.unHover = function () { // calls hover(false) on lastHoveringId (if any)
-    if (lastHoveringId) {
-        ExtendedOverlay.get(lastHoveringId).hover(false);
-    }
-};
-
-// hit(overlay) on the one overlay intersected by pickRay, if any.
-// noHit() if no ExtendedOverlay was intersected (helps with hover)
-ExtendedOverlay.applyPickRay = function (pickRay, hit, noHit) {
-    var pickedOverlay = Overlays.findRayIntersection(pickRay); // Depends on nearer coverOverlays to extend closer to us than farther ones.
-    if (!pickedOverlay.intersects) {
-        if (noHit) {
-            return noHit();
-        }
-        return;
-    }
-    ExtendedOverlay.some(function (overlay) { // See if pickedOverlay is one of ours.
-        if ((overlay.activeOverlay) === pickedOverlay.overlayID) {
-            hit(overlay);
-            return true;
-        }
-    });
-};
-
-function addAvatarNode(id) {
-    return new ExtendedOverlay(id, "sphere", {
-        drawInFront: true,
-        solid: true,
-        alpha: 0.8,
-        color: color(false, false),
-        ignoreRayIntersection: false
-    });
-}
-
-var pingPong = true;
-function updateOverlays() {
-    var eye = Camera.position;
-    AvatarList.getAvatarIdentifiers().forEach(function (id) {
-        if (!id) {
-            return; // don't update ourself, or avatars we're not interested in
-        }
-        var avatar = AvatarList.getAvatar(id);
-        if (!avatar) {
-            return; // will be deleted below if there had been an overlay.
-        }
-        var overlay = ExtendedOverlay.get(id);
-        if (!overlay) { // For now, we're treating this as a temporary loss, as from the personal space bubble. Add it back.
-            overlay = addAvatarNode(id);
-        }
-        var target = avatar.position;
-        var distance = Vec3.distance(target, eye);
-        var offset = 0.2;
-        var diff = Vec3.subtract(target, eye); // get diff between target and eye (a vector pointing to the eye from avatar position)
-        var headIndex = avatar.getJointIndex("Head"); // base offset on 1/2 distance from hips to head if we can
-        if (headIndex > 0) {
-            offset = avatar.getAbsoluteJointTranslationInObjectFrame(headIndex).y / 2;
-        }
-
-        // move a bit in front, towards the camera
-        target = Vec3.subtract(target, Vec3.multiply(Vec3.normalize(diff), offset));
-
-        // now bump it up a bit
-        target.y = target.y + offset;
-
-        overlay.ping = pingPong;
-        overlay.editOverlay({
-            color: color(ExtendedOverlay.isSelected(id), overlay.hovering),
-            position: target,
-            dimensions: 0.032 * distance
-        });
-    });
-    pingPong = !pingPong;
-    ExtendedOverlay.some(function (overlay) { // Remove any that weren't updated. (User is gone.)
-        if (overlay.ping === pingPong) {
-            overlay.deleteOverlay();
-        }
-    });
-}
-function removeOverlays() {
-    selectedId = false;
-    lastHoveringId = 0;
-    ExtendedOverlay.some(function (overlay) {
-        overlay.deleteOverlay();
-    });
-}
-
-//
-// Clicks.
-//
-function usernameFromIDReply(id, username, machineFingerprint, isAdmin) {
-    if (selectedId === id) {
-        var message = {
-            method: 'updateSelectedRecipientUsername',
-            userName: username === "" ? "unknown username" : username
-        };
-        ui.tablet.sendToQml(message);
-    }
-}
-function handleClick(pickRay) {
-    ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
-        var nextSelectedStatus = !overlay.selected;
-        var avatarId = overlay.key;
-        selectedId = nextSelectedStatus ? avatarId : false;
-        if (nextSelectedStatus) {
-            Users.requestUsernameFromID(avatarId);
-        }
-        var message = {
-            method: 'selectRecipient',
-            id: avatarId,
-            isSelected: nextSelectedStatus,
-            displayName: '"' + AvatarList.getAvatar(avatarId).sessionDisplayName + '"',
-            userName: ''
-        };
-        ui.tablet.sendToQml(message);
-
-        ExtendedOverlay.some(function (overlay) {
-            var id = overlay.key;
-            var selected = ExtendedOverlay.isSelected(id);
-            overlay.select(selected);
-        });
-
-        return true;
-    });
-}
-function handleMouseEvent(mousePressEvent) { // handleClick if we get one.
-    if (!mousePressEvent.isLeftButton) {
-        return;
-    }
-    handleClick(Camera.computePickRay(mousePressEvent.x, mousePressEvent.y));
-}
-function handleMouseMove(pickRay) { // given the pickRay, just do the hover logic
-    ExtendedOverlay.applyPickRay(pickRay, function (overlay) {
-        overlay.hover(true);
-    }, function () {
-        ExtendedOverlay.unHover();
-    });
-}
-
-// handy global to keep track of which hand is the mouse (if any)
-var currentHandPressed = 0;
-var TRIGGER_CLICK_THRESHOLD = 0.85;
-var TRIGGER_PRESS_THRESHOLD = 0.05;
-
-function handleMouseMoveEvent(event) { // find out which overlay (if any) is over the mouse position
-    var pickRay;
-    if (HMD.active) {
-        if (currentHandPressed !== 0) {
-            pickRay = controllerComputePickRay(currentHandPressed);
-        } else {
-            // nothing should hover, so
-            ExtendedOverlay.unHover();
-            return;
-        }
-    } else {
-        pickRay = Camera.computePickRay(event.x, event.y);
-    }
-    handleMouseMove(pickRay);
-}
-function handleTriggerPressed(hand, value) {
-    // The idea is if you press one trigger, it is the one
-    // we will consider the mouse.  Even if the other is pressed,
-    // we ignore it until this one is no longer pressed.
-    var isPressed = value > TRIGGER_PRESS_THRESHOLD;
-    if (currentHandPressed === 0) {
-        currentHandPressed = isPressed ? hand : 0;
-        return;
-    }
-    if (currentHandPressed === hand) {
-        currentHandPressed = isPressed ? hand : 0;
-        return;
-    }
-    // otherwise, the other hand is still triggered
-    // so do nothing.
-}
-
-// We get mouseMoveEvents from the handControllers, via handControllerPointer.
-// But we don't get mousePressEvents.
-var triggerMapping = Controller.newMapping(Script.resolvePath('') + '-click');
-var triggerPressMapping = Controller.newMapping(Script.resolvePath('') + '-press');
-function controllerComputePickRay(hand) {
-    var controllerPose = getControllerWorldLocation(hand, true);
-    if (controllerPose.valid) {
-        return { origin: controllerPose.position, direction: Quat.getUp(controllerPose.orientation) };
-    }
-}
-function makeClickHandler(hand) {
-    return function (clicked) {
-        if (clicked > TRIGGER_CLICK_THRESHOLD) {
-            var pickRay = controllerComputePickRay(hand);
-            handleClick(pickRay);
-        }
-    };
-}
-function makePressHandler(hand) {
-    return function (value) {
-        handleTriggerPressed(hand, value);
-    };
-}
-triggerMapping.from(Controller.Standard.RTClick).peek().to(makeClickHandler(Controller.Standard.RightHand));
-triggerMapping.from(Controller.Standard.LTClick).peek().to(makeClickHandler(Controller.Standard.LeftHand));
-triggerPressMapping.from(Controller.Standard.RT).peek().to(makePressHandler(Controller.Standard.RightHand));
-triggerPressMapping.from(Controller.Standard.LT).peek().to(makePressHandler(Controller.Standard.LeftHand));
-// END AVATAR SELECTOR LOGIC
-
 var grid = new Grid();
 function adjustPositionPerBoundingBox(position, direction, registration, dimensions, orientation) {
     // Adjust the position such that the bounding box (registration, dimenions, and orientation) lies behind the original
@@ -563,6 +287,7 @@ function defaultFor(arg, val) {
     return typeof arg !== 'undefined' ? arg : val;
 }
 
+var CERT_ID_URLPARAM_LENGTH = 15; // length of "certificate_id="
 function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
     var isWearable = itemType === "wearable";
     var success = Clipboard.importEntities(itemHref, true, marketplaceItemTesterId);
@@ -585,7 +310,7 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
         }
         var certPos = itemHref.search("certificate_id="); // TODO how do I parse a URL from here?
         if (certPos >= 0) {
-            certPos += 15; // length of "certificate_id="
+            certPos += CERT_ID_URLPARAM_LENGTH;
             var certURLEncoded = itemHref.substring(certPos);
             var certB64Encoded = decodeURIComponent(certURLEncoded);
             for (var key in wearableTransforms) {
@@ -594,7 +319,7 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
                     if (certificateTransforms) {
                         for (var certID in certificateTransforms) {
                             if (certificateTransforms.hasOwnProperty(certID) &&
-                                certID == certB64Encoded) {
+                                certID === certB64Encoded) {
                                 var certificateTransform = certificateTransforms[certID];
                                 wearableLocalPosition = certificateTransform.localPosition;
                                 wearableLocalRotation = certificateTransform.localRotation;
@@ -637,8 +362,10 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
                     targetDirection = Vec3.multiplyQbyV(targetDirection, Vec3.UNIT_Z);
 
                     var targetPosition = getPositionToCreateEntity();
-                    var deltaParallel = HALF_TREE_SCALE;  // Distance to move entities parallel to targetDirection.
-                    var deltaPerpendicular = Vec3.ZERO;  // Distance to move entities perpendicular to targetDirection.
+                    // Distance to move entities parallel to targetDirection.
+                    var deltaParallel = HALF_TREE_SCALE;
+                    // Distance to move entities perpendicular to targetDirection.
+                    var deltaPerpendicular = Vec3.ZERO;
                     for (var i = 0, length = pastedEntityIDs.length; i < length; i++) {
                         var curLoopEntityProps = Entities.getEntityProperties(pastedEntityIDs[i], ["position", "dimensions",
                             "registrationPoint", "rotation", "parentID"]);
@@ -666,7 +393,8 @@ function rezEntity(itemHref, itemType, marketplaceItemTesterId) {
                 }
 
                 if (!Vec3.equal(deltaPosition, Vec3.ZERO)) {
-                    for (var editEntityIndex = 0, numEntities = pastedEntityIDs.length; editEntityIndex < numEntities; editEntityIndex++) {
+                    for (var editEntityIndex = 0,
+                        numEntities = pastedEntityIDs.length; editEntityIndex < numEntities; editEntityIndex++) {
                         if (Uuid.isNull(entityParentIDs[editEntityIndex])) {
                             Entities.editEntity(pastedEntityIDs[editEntityIndex], {
                                 position: Vec3.sum(deltaPosition, entityPositions[editEntityIndex])
@@ -769,79 +497,6 @@ function onWebEventReceived(message) {
         });
     }
 }
-var sendAssetRecipient;
-var sendAssetParticleEffectUpdateTimer;
-var particleEffectTimestamp;
-var sendAssetParticleEffect;
-var SEND_ASSET_PARTICLE_TIMER_UPDATE = 250;
-var SEND_ASSET_PARTICLE_EMITTING_DURATION = 3000;
-var SEND_ASSET_PARTICLE_LIFETIME_SECONDS = 8;
-var SEND_ASSET_PARTICLE_PROPERTIES = {
-    accelerationSpread: { x: 0, y: 0, z: 0 },
-    alpha: 1,
-    alphaFinish: 1,
-    alphaSpread: 0,
-    alphaStart: 1,
-    azimuthFinish: 0,
-    azimuthStart: -6,
-    color: { red: 255, green: 222, blue: 255 },
-    colorFinish: { red: 255, green: 229, blue: 225 },
-    colorSpread: { red: 0, green: 0, blue: 0 },
-    colorStart: { red: 243, green: 255, blue: 255 },
-    emitAcceleration: { x: 0, y: 0, z: 0 }, // Immediately gets updated to be accurate
-    emitDimensions: { x: 0, y: 0, z: 0 },
-    emitOrientation: { x: 0, y: 0, z: 0 },
-    emitRate: 4,
-    emitSpeed: 2.1,
-    emitterShouldTrail: true,
-    isEmitting: 1,
-    lifespan: SEND_ASSET_PARTICLE_LIFETIME_SECONDS + 1, // Immediately gets updated to be accurate
-    lifetime: SEND_ASSET_PARTICLE_LIFETIME_SECONDS + 1,
-    maxParticles: 20,
-    name: 'asset-particles',
-    particleRadius: 0.2,
-    polarFinish: 0,
-    polarStart: 0,
-    radiusFinish: 0.05,
-    radiusSpread: 0,
-    radiusStart: 0.2,
-    speedSpread: 0,
-    textures: "http://hifi-content.s3.amazonaws.com/alan/dev/Particles/Bokeh-Particle-HFC.png",
-    type: 'ParticleEffect'
-};
-
-function updateSendAssetParticleEffect() {
-    var timestampNow = Date.now();
-    if ((timestampNow - particleEffectTimestamp) > (SEND_ASSET_PARTICLE_LIFETIME_SECONDS * 1000)) {
-        deleteSendAssetParticleEffect();
-        return;
-    } else if ((timestampNow - particleEffectTimestamp) > SEND_ASSET_PARTICLE_EMITTING_DURATION) {
-        Entities.editEntity(sendAssetParticleEffect, {
-            isEmitting: 0
-        });
-    } else if (sendAssetParticleEffect) {
-        var recipientPosition = AvatarList.getAvatar(sendAssetRecipient).position;
-        var distance = Vec3.distance(recipientPosition, MyAvatar.position);
-        var accel = Vec3.subtract(recipientPosition, MyAvatar.position);
-        accel.y -= 3.0;
-        var life = Math.sqrt(2 * distance / Vec3.length(accel));
-        Entities.editEntity(sendAssetParticleEffect, {
-            emitAcceleration: accel,
-            lifespan: life
-        });
-    }
-}
-
-function deleteSendAssetParticleEffect() {
-    if (sendAssetParticleEffectUpdateTimer) {
-        Script.clearInterval(sendAssetParticleEffectUpdateTimer);
-        sendAssetParticleEffectUpdateTimer = null;
-    }
-    if (sendAssetParticleEffect) {
-        sendAssetParticleEffect = Entities.deleteEntity(sendAssetParticleEffect);
-    }
-    sendAssetRecipient = null;
-}
 
 var savedDisablePreviewOption = Menu.isOptionChecked("Disable Preview");
 var UI_FADE_TIMEOUT_MS = 150;
@@ -868,26 +523,17 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     }
     switch (message.method) {
     case 'gotoBank':
-	    ui.close();
+        ui.close();
         if (Account.metaverseServerURL.indexOf("staging") >= 0) {
             Window.location = "hifi://hifiqa-master-metaverse-staging"; // So that we can test in staging.
         } else {
             Window.location = "hifi://BankOfHighFidelity";
         }
-	break;
-    case 'purchases_openWallet':
+        break;
     case 'checkout_openWallet':
     case 'checkout_setUpClicked':
         openWallet();
         break;
-    case 'purchases_walletNotSetUp':
-        wireQmlEventBridge(true);
-        ui.tablet.sendToQml({
-            method: 'updateWalletReferrer',
-            referrer: "purchases"
-        });
-        openWallet();
-        break;
     case 'checkout_walletNotSetUp':
         wireQmlEventBridge(true);
         ui.tablet.sendToQml({
@@ -911,12 +557,6 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     case 'checkout_continueShopping':
         openMarketplace();
         break;
-    case 'purchases_itemInfoClicked':
-        var itemId = message.itemId;
-        if (itemId && itemId !== "") {
-            openMarketplace(itemId);
-        }
-        break;
     case 'checkout_rezClicked':
     case 'purchases_rezClicked':
     case 'tester_rezClicked':
@@ -945,7 +585,6 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
         }
         break;
     case 'header_marketplaceImageClicked':
-    case 'purchases_backClicked':
         openMarketplace(message.referrerURL);
         break;
     case 'purchases_goToMarketplaceClicked':
@@ -975,13 +614,9 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     case 'maybeEnableHmdPreview':
         maybeEnableHMDPreview();
         break;
-    case 'purchases_openGoTo':
+    case 'checkout_openGoTo':
         ui.open("hifi/tablet/TabletAddressDialog.qml");
         break;
-    case 'purchases_itemCertificateClicked':
-        contextOverlayEntity = "";
-        setCertificateInfo(contextOverlayEntity, message.itemCertificateId);
-        break;
     case 'inspectionCertificate_closeClicked':
         ui.close();
         break;
@@ -1000,85 +635,11 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
             method: 'purchases_showMyItems'
         });
         break;
-    case 'refreshConnections':
-        // Guard to prevent this code from being executed while sending money --
-        // we only want to execute this while sending non-HFC gifts
-        if (!onWalletScreen) {
-            print('Refreshing Connections...');
-            getConnectionData(false);
-        }
-        break;
-    case 'enable_ChooseRecipientNearbyMode':
-        // Guard to prevent this code from being executed while sending money --
-        // we only want to execute this while sending non-HFC gifts
-        if (!onWalletScreen) {
-            if (!isUpdateOverlaysWired) {
-                Script.update.connect(updateOverlays);
-                isUpdateOverlaysWired = true;
-            }
-        }
-        break;
-    case 'disable_ChooseRecipientNearbyMode':
-        // Guard to prevent this code from being executed while sending money --
-        // we only want to execute this while sending non-HFC gifts
-        if (!onWalletScreen) {
-            if (isUpdateOverlaysWired) {
-                Script.update.disconnect(updateOverlays);
-                isUpdateOverlaysWired = false;
-            }
-            removeOverlays();
-        }
-        break;
-    case 'purchases_availableUpdatesReceived':
-        shouldShowDot = message.numUpdates > 0;
-        ui.messagesWaiting(shouldShowDot && !ui.isOpen);
-        break;
-    case 'purchases_updateWearables':
-        var currentlyWornWearables = [];
-        var ATTACHMENT_SEARCH_RADIUS = 100; // meters (just in case)
-
-        var nearbyEntities = Entities.findEntitiesByType('Model', MyAvatar.position, ATTACHMENT_SEARCH_RADIUS);
-
-        for (var i = 0; i < nearbyEntities.length; i++) {
-            var currentProperties = Entities.getEntityProperties(
-                nearbyEntities[i], ['certificateID', 'editionNumber', 'parentID']
-            );
-            if (currentProperties.parentID === MyAvatar.sessionUUID) {
-                currentlyWornWearables.push({
-                    entityID: nearbyEntities[i],
-                    entityCertID: currentProperties.certificateID,
-                    entityEdition: currentProperties.editionNumber
-                });
-            }
-        }
-
-        ui.tablet.sendToQml({ method: 'updateWearables', wornWearables: currentlyWornWearables });
-        break;
-    case 'sendAsset_sendPublicly':
-        if (message.assetName !== "") {
-            deleteSendAssetParticleEffect();
-            sendAssetRecipient = message.recipient;
-            var props = SEND_ASSET_PARTICLE_PROPERTIES;
-            props.parentID = MyAvatar.sessionUUID;
-            props.position = MyAvatar.position;
-            props.position.y += 0.2;
-            if (message.effectImage) {
-                props.textures = message.effectImage;
-            }
-            sendAssetParticleEffect = Entities.addEntity(props, true);
-            particleEffectTimestamp = Date.now();
-            updateSendAssetParticleEffect();
-            sendAssetParticleEffectUpdateTimer = Script.setInterval(updateSendAssetParticleEffect,
-                SEND_ASSET_PARTICLE_TIMER_UPDATE);
-        }
-        break;
     case 'http.request':
         // Handled elsewhere, don't log.
         break;
-    case 'goToPurchases_fromWalletHome': // HRS FIXME What's this about?
-        break;
     default:
-        print('Unrecognized message from Checkout.qml or Purchases.qml: ' + JSON.stringify(message));
+        print('Unrecognized message from Checkout.qml: ' + JSON.stringify(message));
     }
 };
 
@@ -1163,15 +724,7 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
     }
 
     if (onCommerceScreen) {
-        if (!isWired) {
-            Users.usernameFromIDReply.connect(usernameFromIDReply);
-            Controller.mousePressEvent.connect(handleMouseEvent);
-            Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
-            triggerMapping.enable();
-            triggerPressMapping.enable();
-        }
-        isWired = true;
-        Wallet.refreshWalletStatus();
+        WalletScriptingInterface.refreshWalletStatus();
     } else {
         if (onMarketplaceScreen) {
             onMarketplaceOpen('marketplace cta');
@@ -1193,44 +746,11 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
         "\nNew screen URL: " + url + "\nCurrent app open status: " + ui.isOpen + "\n");
 };
 
-function notificationDataProcessPage(data) {
-    return data.data.updates;
-}
-
-var shouldShowDot = false;
-function notificationPollCallback(updatesArray) {
-    shouldShowDot = shouldShowDot || updatesArray.length > 0;
-    ui.messagesWaiting(shouldShowDot && !ui.isOpen);
-
-    if (updatesArray.length > 0) {
-        var message;
-        if (!ui.notificationInitialCallbackMade) {
-            message = updatesArray.length + " of your purchased items " +
-                (updatesArray.length === 1 ? "has an update " : "have updates ") +
-                "available. Open MARKET to update.";
-            ui.notificationDisplayBanner(message);
-
-            ui.notificationPollCaresAboutSince = true;
-        } else {
-            for (var i = 0; i < updatesArray.length; i++) {
-                message = "Update available for \"" +
-                    updatesArray[i].base_item_title + "\"." +
-                    "Open MARKET to update.";
-                ui.notificationDisplayBanner(message);
-            }
-        }
-    }
-}
-
-function isReturnedDataEmpty(data) {
-    var historyArray = data.data.updates;
-    return historyArray.length === 0;
-}
-
 
 var BUTTON_NAME = "MARKET";
-var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace";
-var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?"; // Append "?" to signal injected script that it's the initial page.
+var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+// Append "?" if necessary to signal injected script that it's the initial page.
+var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + (MARKETPLACE_URL.indexOf("?") > -1 ? "" : "?");
 var ui;
 function startup() {
     ui = new AppUi({
@@ -1239,50 +759,26 @@ function startup() {
         inject: MARKETPLACES_INJECT_SCRIPT_URL,
         home: MARKETPLACE_URL_INITIAL,
         onScreenChanged: onTabletScreenChanged,
-        onMessage: onQmlMessageReceived,
-        // notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
-        // notificationPollTimeoutMs: 300000,
-        // notificationDataProcessPage: notificationDataProcessPage,
-        // notificationPollCallback: notificationPollCallback,
-        // notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        // notificationPollCaresAboutSince: false // Changes to true after first poll
+        onMessage: onQmlMessageReceived
     });
     ContextOverlay.contextOverlayClicked.connect(openInspectionCertificateQML);
     Entities.canWriteAssetsChanged.connect(onCanWriteAssetsChanged);
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     ui.tablet.webEventReceived.connect(onWebEventReceived);
-    Wallet.walletStatusChanged.connect(sendCommerceSettings);
+    WalletScriptingInterface.walletStatusChanged.connect(sendCommerceSettings);
     Window.messageBoxClosed.connect(onMessageBoxClosed);
     ResourceRequestObserver.resourceRequestEvent.connect(onResourceRequestEvent);
 
-    Wallet.refreshWalletStatus();
+    WalletScriptingInterface.refreshWalletStatus();
 }
 
-var isWired = false;
-var isUpdateOverlaysWired = false;
 function off() {
-    if (isWired) {
-        Users.usernameFromIDReply.disconnect(usernameFromIDReply);
-        Controller.mousePressEvent.disconnect(handleMouseEvent);
-        Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
-        triggerMapping.disable();
-        triggerPressMapping.disable();
-
-        isWired = false;
-    }
-
-    if (isUpdateOverlaysWired) {
-        Script.update.disconnect(updateOverlays);
-        isUpdateOverlaysWired = false;
-    }
-    removeOverlays();
 }
 function shutdown() {
     maybeEnableHMDPreview();
-    deleteSendAssetParticleEffect();
 
     Window.messageBoxClosed.disconnect(onMessageBoxClosed);
-    Wallet.walletStatusChanged.disconnect(sendCommerceSettings);
+    WalletScriptingInterface.walletStatusChanged.disconnect(sendCommerceSettings);
     ui.tablet.webEventReceived.disconnect(onWebEventReceived);
     GlobalServices.myUsernameChanged.disconnect(onUsernameChanged);
     Entities.canWriteAssetsChanged.disconnect(onCanWriteAssetsChanged);
diff --git a/scripts/system/notifications.js b/scripts/system/notifications.js
index 36fe264274..9558b99310 100644
--- a/scripts/system/notifications.js
+++ b/scripts/system/notifications.js
@@ -634,7 +634,7 @@
     Window.notifyEditError = onEditError;
     Window.notify = onNotify;
     Tablet.tabletNotification.connect(tabletNotification);
-    Wallet.walletNotSetup.connect(walletNotSetup);
+    WalletScriptingInterface.walletNotSetup.connect(walletNotSetup);
 
     Messages.subscribe(NOTIFICATIONS_MESSAGE_CHANNEL);
     Messages.messageReceived.connect(onMessageReceived);

From 91b199a456e61886464d07deb3144f1da2a18394 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Tue, 30 Oct 2018 16:29:20 -0700
Subject: [PATCH 19/73] Checkpoint Proofs Filter in Inventory

---
 .../resources/qml/controls-uit/FilterBar.qml  | 70 +++++++++++--------
 .../qml/hifi/commerce/purchases/Purchases.qml |  5 ++
 interface/src/commerce/Ledger.cpp             | 10 ++-
 interface/src/commerce/Ledger.h               |  2 +-
 interface/src/commerce/QmlCommerce.cpp        |  5 +-
 interface/src/commerce/QmlCommerce.h          |  2 +-
 6 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controls-uit/FilterBar.qml
index ecae790b22..71aa1f64ab 100644
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controls-uit/FilterBar.qml
@@ -260,38 +260,50 @@ Item {
             interactive: false;
             anchors.fill: parent;
             model: filterBarModel;
-            delegate: Rectangle {
-                id: dropDownButton;
-                color: hifi.colors.white;
-                width: parent.width;
+            delegate: Item {
+                width:   parent.width;
                 height: 50;
+                Rectangle {
+                    id: dropDownButton;
+                    color: hifi.colors.white;
+                    width: parent.width;
+                    height: 50;
+                    visible: true;
 
-                RalewaySemiBold {
-                    id: dropDownButtonText;
-                    text: model.displayName;
-                    anchors.fill: parent;
-                    anchors.leftMargin: 12;
-                    color: hifi.colors.baseGray;
-                    horizontalAlignment: Text.AlignLeft;
-                    verticalAlignment: Text.AlignVCenter;
-                    size: 18;
+                    RalewaySemiBold {
+                        id: dropDownButtonText;
+                        text: model.displayName;
+                        anchors.fill: parent;
+                        anchors.topMargin: 2;
+                        anchors.leftMargin: 12;
+                        color: hifi.colors.baseGray;
+                        horizontalAlignment: Text.AlignLeft;
+                        verticalAlignment: Text.AlignVCenter;
+                        size: 18;
+                    }
+
+                    MouseArea {
+                        anchors.fill: parent;
+                        hoverEnabled: true;
+                        propagateComposedEvents: false;
+                        onEntered: {
+                            dropDownButton.color = hifi.colors.blueHighlight;
+                        }
+                        onExited: {
+                            dropDownButton.color = hifi.colors.white;
+                        }
+                        onClicked: {
+                            textField.forceActiveFocus();
+                            root.primaryFilter_index = index;
+                            dropdownContainer.visible = false;
+                        }
+                    }
                 }
-
-                MouseArea {
-                    anchors.fill: parent;
-                    hoverEnabled: true;
-                    propagateComposedEvents: false;
-                    onEntered: {
-                        dropDownButton.color = hifi.colors.blueHighlight;
-                    }
-                    onExited: {
-                        dropDownButton.color = hifi.colors.white;
-                    }
-                    onClicked: {
-                        textField.forceActiveFocus();
-                        root.primaryFilter_index = index;
-                        dropdownContainer.visible = false;
-                    }
+                Rectangle {
+                    height: 2;
+                    width: parent.width;
+                    color: hifi.colors.lightGray;
+                    visible: model.separator
                 }
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 655af79e68..9cbabb769f 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -518,8 +518,13 @@ Rectangle {
                             "filterName": "wearable"
                         },
                         {
+                            "separator" : true,
                             "displayName": "Updatable",
                             "filterName": "updated"
+                        },
+                        {
+                            "displayName": "Proofs",
+                            "filterName": "proofs"
                         }
                     ]
                     filterBar.primaryFilterChoices.clear();
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 67303f2a9b..d206d773de 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -152,10 +152,14 @@ void Ledger::balance(const QStringList& keys) {
     keysQuery("balance", "balanceSuccess", "balanceFailure");
 }
 
-void Ledger::inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
+void Ledger::inventory(const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
     QJsonObject params;
-    params["edition_filter"] = editionFilter;
-    params["type_filter"] = typeFilter;
+    if (typeFilter == "proofs") {
+        params["edition_filter"] = "proofs";
+    } else {
+        params["type_filter"] = typeFilter;
+    }
+
     params["title_filter"] = titleFilter;
     params["page"] = page;
     params["per_page"] = perPage;
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 427395ee11..7bff9abe9b 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -29,7 +29,7 @@ public:
     bool receiveAt(const QString& hfc_key, const QString& signing_key, const QByteArray& locker);
     bool receiveAt();
     void balance(const QStringList& keys);
-    void inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
+    void inventory(const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
     void history(const QStringList& keys, const int& pageNumber, const int& itemsPerPage);
     void account();
     void updateLocation(const QString& asset_id, const QString& location, const bool& alsoUpdateSiblings = false, const bool controlledFailure = false);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index ffe89ffc5b..369b03d610 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -151,8 +151,7 @@ void QmlCommerce::balance() {
     }
 }
 
-void QmlCommerce::inventory(const QString& editionFilter,
-                            const QString& typeFilter,
+void QmlCommerce::inventory(const QString& typeFilter,
                             const QString& titleFilter,
                             const int& page,
                             const int& perPage) {
@@ -160,7 +159,7 @@ void QmlCommerce::inventory(const QString& editionFilter,
     auto wallet = DependencyManager::get<Wallet>();
     QStringList cachedPublicKeys = wallet->listPublicKeys();
     if (!cachedPublicKeys.isEmpty()) {
-        ledger->inventory(editionFilter, typeFilter, titleFilter, page, perPage);
+        ledger->inventory(typeFilter, titleFilter, page, perPage);
     }
 }
 
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index 2e3c0ec24d..a8eb45261d 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -74,7 +74,7 @@ protected:
 
     Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
     Q_INVOKABLE void balance();
-    Q_INVOKABLE void inventory(const QString& editionFilter = QString(), const QString& typeFilter = QString(), const QString& titleFilter = QString(), const int& page = 1, const int& perPage = 20);
+    Q_INVOKABLE void inventory(const QString& typeFilter = QString(), const QString& titleFilter = QString(), const int& page = 1, const int& perPage = 20);
     Q_INVOKABLE void history(const int& pageNumber, const int& itemsPerPage = 100);
     Q_INVOKABLE void generateKeyPair();
     Q_INVOKABLE void account();

From becee7f010571d3ffd61deeb062d16a73a06e2a1 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 30 Oct 2018 17:28:42 -0700
Subject: [PATCH 20/73] Re-name FBXGeometry to HFMGeometry and do the same for
 related classes

---
 .../src/avatars/ScriptableAvatar.cpp          |  12 +-
 interface/src/ModelPackager.cpp               |   4 +-
 interface/src/ModelPackager.h                 |   6 +-
 interface/src/ModelPropertiesDialog.cpp       |   4 +-
 interface/src/ModelPropertiesDialog.h         |   4 +-
 interface/src/avatar/MyAvatar.cpp             |  14 +-
 interface/src/avatar/MySkeletonModel.cpp      |   2 +-
 interface/src/raypick/CollisionPick.cpp       |  30 ++--
 interface/src/ui/overlays/ModelOverlay.cpp    |  22 +--
 libraries/animation/src/AnimClip.cpp          |  18 +--
 libraries/animation/src/AnimSkeleton.cpp      |  16 +-
 libraries/animation/src/AnimSkeleton.h        |   8 +-
 libraries/animation/src/AnimationCache.cpp    |  18 +--
 libraries/animation/src/AnimationCache.h      |  12 +-
 libraries/animation/src/AnimationObject.cpp   |   8 +-
 libraries/animation/src/AnimationObject.h     |   4 +-
 libraries/animation/src/Rig.cpp               |  18 +--
 libraries/animation/src/Rig.h                 |  22 +--
 .../src/avatars-renderer/Avatar.cpp           |   6 +-
 .../src/avatars-renderer/SkeletonModel.cpp    |  16 +-
 .../src/avatars-renderer/SkeletonModel.h      |   4 +-
 libraries/baking/src/FBXBaker.cpp             |   6 +-
 libraries/baking/src/FBXBaker.h               |   2 +-
 libraries/baking/src/ModelBaker.cpp           |   2 +-
 libraries/baking/src/ModelBaker.h             |   2 +-
 libraries/baking/src/OBJBaker.cpp             |   8 +-
 libraries/baking/src/OBJBaker.h               |   4 +-
 .../src/RenderableModelEntityItem.cpp         |  66 ++++----
 libraries/fbx/src/FBX.h                       |  90 +++++------
 libraries/fbx/src/FBXReader.cpp               | 150 +++++++++---------
 libraries/fbx/src/FBXReader.h                 |  16 +-
 libraries/fbx/src/FBXReader_Material.cpp      |  40 ++---
 libraries/fbx/src/FBXReader_Mesh.cpp          |  76 ++++-----
 libraries/fbx/src/GLTFReader.cpp              |  62 ++++----
 libraries/fbx/src/GLTFReader.h                |  10 +-
 libraries/fbx/src/OBJReader.cpp               |  84 +++++-----
 libraries/fbx/src/OBJReader.h                 |  12 +-
 .../src/model-networking/ModelCache.cpp       |  54 +++----
 .../src/model-networking/ModelCache.h         |  14 +-
 .../render-utils/src/CauterizedModel.cpp      |  18 +--
 .../render-utils/src/MeshPartPayload.cpp      |   4 +-
 libraries/render-utils/src/Model.cpp          |  76 ++++-----
 libraries/render-utils/src/Model.h            |   6 +-
 .../render-utils/src/SoftAttachmentModel.cpp  |   6 +-
 tests-manual/gpu/src/TestFbx.cpp              |   2 +-
 tests-manual/gpu/src/TestFbx.h                |   2 +-
 .../src/AnimInverseKinematicsTests.cpp        |   8 +-
 tools/skeleton-dump/src/SkeletonDumpApp.cpp   |   4 +-
 tools/vhacd-util/src/VHACDUtil.cpp            |  44 ++---
 tools/vhacd-util/src/VHACDUtil.h              |  12 +-
 tools/vhacd-util/src/VHACDUtilApp.cpp         |  26 +--
 tools/vhacd-util/src/VHACDUtilApp.h           |   2 +-
 52 files changed, 578 insertions(+), 578 deletions(-)

diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
index 7d2b267a05..385f94d9f3 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -69,10 +69,10 @@ void ScriptableAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     AvatarData::setSkeletonModelURL(skeletonModelURL);
 }
 
-static AnimPose composeAnimPose(const FBXJoint& fbxJoint, const glm::quat rotation, const glm::vec3 translation) {
+static AnimPose composeAnimPose(const HFMJoint& joint, const glm::quat rotation, const glm::vec3 translation) {
     glm::mat4 translationMat = glm::translate(translation);
-    glm::mat4 rotationMat = glm::mat4_cast(fbxJoint.preRotation * rotation * fbxJoint.postRotation);
-    glm::mat4 finalMat = translationMat * fbxJoint.preTransform * rotationMat * fbxJoint.postTransform;
+    glm::mat4 rotationMat = glm::mat4_cast(joint.preRotation * rotation * joint.postRotation);
+    glm::mat4 finalMat = translationMat * joint.preTransform * rotationMat * joint.postTransform;
     return AnimPose(finalMat);
 }
 
@@ -93,7 +93,7 @@ void ScriptableAvatar::update(float deltatime) {
             }
             _animationDetails.currentFrame = currentFrame;
 
-            const QVector<FBXJoint>& modelJoints = _bind->getGeometry().joints;
+            const QVector<HFMJoint>& modelJoints = _bind->getGeometry().joints;
             QStringList animationJointNames = _animation->getJointNames();
 
             const int nJoints = modelJoints.size();
@@ -102,8 +102,8 @@ void ScriptableAvatar::update(float deltatime) {
             }
 
             const int frameCount = _animation->getFrames().size();
-            const FBXAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
-            const FBXAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
+            const HFMAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
+            const HFMAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
             const float frameFraction = glm::fract(currentFrame);
             std::vector<AnimPose> poses = _animSkeleton->getRelativeDefaultPoses();
 
diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 3a5d92eb8c..0b2846006b 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -235,7 +235,7 @@ bool ModelPackager::zipModel() {
     return true;
 }
 
-void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry) {
+void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry) {
 
     bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
 
@@ -370,7 +370,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
 
 void ModelPackager::listTextures() {
     _textures.clear();
-    foreach (const FBXMaterial mat, _geometry->materials) {
+    foreach (const HFMMaterial mat, _geometry->materials) {
         if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&
             !_textures.contains(mat.albedoTexture.filename)) {
             _textures << mat.albedoTexture.filename;
diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index 76295e5a85..b68d9e746d 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -19,7 +19,7 @@
 
 #include "ui/ModelsBrowser.h"
 
-class FBXGeometry;
+class HFMGeometry;
 
 class ModelPackager : public QObject {
 public:
@@ -32,7 +32,7 @@ private:
     bool editProperties();
     bool zipModel();
     
-    void populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry);
+    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry);
     
     void listTextures();
     bool copyTextures(const QString& oldDir, const QDir& newDir);
@@ -44,7 +44,7 @@ private:
     QString _scriptDir;
 
     QVariantHash _mapping;
-    std::unique_ptr<FBXGeometry> _geometry;
+    std::unique_ptr<HFMGeometry> _geometry;
     QStringList _textures;
     QStringList _scripts;
 };
diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index 8984f89d07..dcda85d117 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -27,7 +27,7 @@
 
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                                             const QString& basePath, const FBXGeometry& geometry) :
+                                             const QString& basePath, const HFMGeometry& geometry) :
 _modelType(modelType),
 _originalMapping(originalMapping),
 _basePath(basePath),
@@ -249,7 +249,7 @@ QComboBox* ModelPropertiesDialog::createJointBox(bool withNone) const {
     if (withNone) {
         box->addItem("(none)");
     }
-    foreach (const FBXJoint& joint, _geometry.joints) {
+    foreach (const HFMJoint& joint, _geometry.joints) {
         if (joint.isSkeletonJoint || !_geometry.hasSkeletonJoints) {
             box->addItem(joint.name);
         }
diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h
index e3c2d8ed6a..d1a020bec3 100644
--- a/interface/src/ModelPropertiesDialog.h
+++ b/interface/src/ModelPropertiesDialog.h
@@ -30,7 +30,7 @@ class ModelPropertiesDialog : public QDialog {
     
 public:
     ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                          const QString& basePath, const FBXGeometry& geometry);
+                          const QString& basePath, const HFMGeometry& geometry);
     
     QVariantHash getMapping() const;
     
@@ -50,7 +50,7 @@ private:
     FSTReader::ModelType _modelType;
     QVariantHash _originalMapping;
     QString _basePath;
-    FBXGeometry _geometry;
+    HFMGeometry _geometry;
     QLineEdit* _name = nullptr;
     QPushButton* _textureDirectory = nullptr;
     QPushButton* _scriptDirectory = nullptr;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 3299bd10e7..b3a66f70b8 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -155,7 +155,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     });
     connect(_skeletonModel.get(), &Model::rigReady, this, [this]() {
         if (_shouldLoadScripts) {
-            auto geometry = getSkeletonModel()->getFBXGeometry();
+            auto geometry = getSkeletonModel()->getHFMGeometry();
             qApp->loadAvatarScripts(geometry.scripts);
             _shouldLoadScripts = false;
         }
@@ -2429,10 +2429,10 @@ void MyAvatar::attachmentDataToEntityProperties(const AttachmentData& data, Enti
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
     if (_skeletonModel->isLoaded()) {
-        neckJointIndex = _skeletonModel->getFBXGeometry().neckJointIndex;
+        neckJointIndex = _skeletonModel->getHFMGeometry().neckJointIndex;
     }
     if (neckJointIndex == -1) {
-        neckJointIndex = (_skeletonModel->getFBXGeometry().headJointIndex - 1);
+        neckJointIndex = (_skeletonModel->getHFMGeometry().headJointIndex - 1);
         if (neckJointIndex < 0) {
             // return if the head is not even there. can't cauterize!!
             return;
@@ -2443,7 +2443,7 @@ void MyAvatar::initHeadBones() {
     q.push(neckJointIndex);
     _headBoneSet.insert(neckJointIndex);
 
-    // fbxJoints only hold links to parents not children, so we have to do a bit of extra work here.
+    // hfmJoints only hold links to parents not children, so we have to do a bit of extra work here.
     while (q.size() > 0) {
         int jointIndex = q.front();
         for (int i = 0; i < _skeletonModel->getJointStateCount(); i++) {
@@ -2592,11 +2592,11 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
         if (_skeletonModel && _skeletonModel->isLoaded()) {
             const Rig& rig = _skeletonModel->getRig();
-            const FBXGeometry& geometry = _skeletonModel->getFBXGeometry();
+            const HFMGeometry& geometry = _skeletonModel->getHFMGeometry();
             for (int i = 0; i < rig.getJointStateCount(); i++) {
                 AnimPose jointPose;
                 rig.getAbsoluteJointPoseInRigFrame(i, jointPose);
-                const FBXJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
+                const HFMJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
                 const AnimPose pose = rigToWorldPose * jointPose;
                 for (size_t j = 0; j < shapeInfo.debugLines.size() / 2; j++) {
                     glm::vec3 pointA = pose.xformPoint(shapeInfo.debugLines[2 * j]);
@@ -4012,7 +4012,7 @@ float MyAvatar::getSitStandStateChange() const {
 }
 
 QVector<QString> MyAvatar::getScriptUrls() {
-    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getFBXGeometry().scripts : QVector<QString>();
+    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getHFMGeometry().scripts : QVector<QString>();
     return scripts;
 }
 
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index c6aae6124a..3ec40d372b 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -90,7 +90,7 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
 
 // Called within Model::simulate call, below.
 void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     Head* head = _owningAvatar->getHead();
 
diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp
index 25927c5b68..e8a53aa9b6 100644
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@@ -131,7 +131,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const FBXGeometry& collisionGeometry = resource->getFBXGeometry();
+        const HFMGeometry& collisionGeometry = resource->getHFMGeometry();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -139,15 +139,15 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
 
         // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
         // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
-        foreach (const FBXMesh& mesh, collisionGeometry.meshes) {
+        foreach (const HFMMesh& mesh, collisionGeometry.meshes) {
             // each meshPart is a convex hull
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 pointCollection.push_back(QVector<glm::vec3>());
                 ShapeInfo::PointList& pointsInPart = pointCollection[i];
 
                 // run through all the triangles and (uniquely) add each point to the hull
                 uint32_t numIndices = (uint32_t)meshPart.triangleIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % TRIANGLE_STRIDE == 0);
                 numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -168,7 +168,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
 
                 // run through all the quads and (uniquely) add each point to the hull
                 numIndices = (uint32_t)meshPart.quadIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % QUAD_STRIDE == 0);
                 numIndices -= numIndices % QUAD_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -206,7 +206,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / resource->getFBXGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / resource->getHFMGeometry().getUnscaledMeshExtents().size();
         // multiply each point by scale
         for (int32_t i = 0; i < pointCollection.size(); i++) {
             for (int32_t j = 0; j < pointCollection[i].size(); j++) {
@@ -216,11 +216,11 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         }
         shapeInfo.setParams(type, dimensions, resource->getURL().toString());
     } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
-        const FBXGeometry& fbxGeometry = resource->getFBXGeometry();
-        int numFbxMeshes = fbxGeometry.meshes.size();
+        const HFMGeometry& hfmGeometry = resource->getHFMGeometry();
+        int numHFMMeshes = hfmGeometry.meshes.size();
         int totalNumVertices = 0;
-        for (int i = 0; i < numFbxMeshes; i++) {
-            const FBXMesh& mesh = fbxGeometry.meshes.at(i);
+        for (int i = 0; i < numHFMMeshes; i++) {
+            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
             totalNumVertices += mesh.vertices.size();
         }
         const int32_t MAX_VERTICES_PER_STATIC_MESH = 1e6;
@@ -230,7 +230,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
             return;
         }
 
-        auto& meshes = resource->getFBXGeometry().meshes;
+        auto& meshes = resource->getHFMGeometry().meshes;
         int32_t numMeshes = (int32_t)(meshes.size());
 
         const int MAX_ALLOWED_MESH_COUNT = 1000;
@@ -285,12 +285,12 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
             if (type == SHAPE_TYPE_STATIC_MESH) {
                 // copy into triangleIndices
                 size_t triangleIndicesCount = 0;
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     triangleIndicesCount += meshPart.triangleIndices.count();
                 }
                 triangleIndices.reserve((int)triangleIndicesCount);
 
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     const int* indexItr = meshPart.triangleIndices.cbegin();
                     while (indexItr != meshPart.triangleIndices.cend()) {
                         triangleIndices.push_back(*indexItr);
@@ -299,11 +299,11 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
                 }
             } else if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
                 // for each mesh copy unique part indices, separated by special bogus (flag) index values
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     // collect unique list of indices for this part
                     std::set<int32_t> uniqueIndices;
                     auto numIndices = meshPart.triangleIndices.count();
-                    // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                    // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                     //assert(numIndices% TRIANGLE_STRIDE == 0);
                     numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index eee8222051..1b66ff08ad 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -446,7 +446,7 @@ QVariant ModelOverlay::getProperty(const QString& property) {
 
     if (property == "jointNames") {
         if (_model && _model->isActive()) {
-            // note: going through Rig because Model::getJointNames() (which proxies to FBXGeometry) was always empty
+            // note: going through Rig because Model::getJointNames() (which proxies to HFMGeometry) was always empty
             const Rig* rig = &(_model->getRig());
             return mapJoints<QStringList, QString>([rig](int jointIndex) -> QString {
                 return rig->nameOfJoint(jointIndex);
@@ -574,7 +574,7 @@ void ModelOverlay::animate() {
 
     QVector<JointData> jointsData;
 
-    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    const QVector<HFMAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
     int frameCount = frames.size();
     if (frameCount <= 0) {
         return;
@@ -606,10 +606,10 @@ void ModelOverlay::animate() {
     }
 
     QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& fbxJoints = _animation->getGeometry().joints;
+    auto& hfmJoints = _animation->getGeometry().joints;
 
-    auto& originalFbxJoints = _model->getFBXGeometry().joints;
-    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMGeometry().joints;
+    auto& originalFbxIndices = _model->getHFMGeometry().jointIndices;
 
     const QVector<glm::quat>& rotations = frames[_lastKnownCurrentFrame].rotations;
     const QVector<glm::vec3>& translations = frames[_lastKnownCurrentFrame].translations;
@@ -626,23 +626,23 @@ void ModelOverlay::animate() {
                     translationMat = glm::translate(translations[index]);
                 }
             } else if (index < animationJointNames.size()) {
-                QString jointName = fbxJoints[index].name;
+                QString jointName = hfmJoints[index].name;
 
                 if (originalFbxIndices.contains(jointName)) {
                     // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get its translation.
                     int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
-                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                    translationMat = glm::translate(originalHFMJoints[remappedIndex].translation);
                 }
             }
             glm::mat4 rotationMat;
             if (index < rotations.size()) {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * rotations[index] * hfmJoints[index].postRotation);
             } else {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * hfmJoints[index].postRotation);
             }
 
-            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
-                rotationMat * fbxJoints[index].postTransform);
+            glm::mat4 finalMat = (translationMat * hfmJoints[index].preTransform *
+                rotationMat * hfmJoints[index].postTransform);
             auto& jointData = jointsData[j];
             jointData.translation = extractTranslation(finalMat);
             jointData.translationIsDefaultPose = false;
diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index f9195a608b..d630218165 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -101,7 +101,7 @@ void AnimClip::copyFromNetworkAnim() {
 
     // build a mapping from animation joint indices to skeleton joint indices.
     // by matching joints with the same name.
-    const FBXGeometry& geom = _networkAnim->getGeometry();
+    const HFMGeometry& geom = _networkAnim->getGeometry();
     AnimSkeleton animSkeleton(geom);
     const auto animJointCount = animSkeleton.getNumJoints();
     const auto skeletonJointCount = _skeleton->getNumJoints();
@@ -120,7 +120,7 @@ void AnimClip::copyFromNetworkAnim() {
 
     for (int frame = 0; frame < frameCount; frame++) {
 
-        const FBXAnimationFrame& fbxAnimFrame = geom.animationFrames[frame];
+        const HFMAnimationFrame& hfmAnimFrame = geom.animationFrames[frame];
 
         // init all joints in animation to default pose
         // this will give us a resonable result for bones in the model skeleton but not in the animation.
@@ -132,8 +132,8 @@ void AnimClip::copyFromNetworkAnim() {
         for (int animJoint = 0; animJoint < animJointCount; animJoint++) {
             int skeletonJoint = jointMap[animJoint];
 
-            const glm::vec3& fbxAnimTrans = fbxAnimFrame.translations[animJoint];
-            const glm::quat& fbxAnimRot = fbxAnimFrame.rotations[animJoint];
+            const glm::vec3& hfmAnimTrans = hfmAnimFrame.translations[animJoint];
+            const glm::quat& hfmAnimRot = hfmAnimFrame.rotations[animJoint];
 
             // skip joints that are in the animation but not in the skeleton.
             if (skeletonJoint >= 0 && skeletonJoint < skeletonJointCount) {
@@ -146,19 +146,19 @@ void AnimClip::copyFromNetworkAnim() {
                 preRot.scale() = glm::vec3(1.0f);
                 postRot.scale() = glm::vec3(1.0f);
 
-                AnimPose rot(glm::vec3(1.0f), fbxAnimRot, glm::vec3());
+                AnimPose rot(glm::vec3(1.0f), hfmAnimRot, glm::vec3());
 
                 // adjust translation offsets, so large translation animatons on the reference skeleton
                 // will be adjusted when played on a skeleton with short limbs.
-                const glm::vec3& fbxZeroTrans = geom.animationFrames[0].translations[animJoint];
+                const glm::vec3& hfmZeroTrans = geom.animationFrames[0].translations[animJoint];
                 const AnimPose& relDefaultPose = _skeleton->getRelativeDefaultPose(skeletonJoint);
                 float boneLengthScale = 1.0f;
                 const float EPSILON = 0.0001f;
-                if (fabsf(glm::length(fbxZeroTrans)) > EPSILON) {
-                    boneLengthScale = glm::length(relDefaultPose.trans()) / glm::length(fbxZeroTrans);
+                if (fabsf(glm::length(hfmZeroTrans)) > EPSILON) {
+                    boneLengthScale = glm::length(relDefaultPose.trans()) / glm::length(hfmZeroTrans);
                 }
 
-                AnimPose trans = AnimPose(glm::vec3(1.0f), glm::quat(), relDefaultPose.trans() + boneLengthScale * (fbxAnimTrans - fbxZeroTrans));
+                AnimPose trans = AnimPose(glm::vec3(1.0f), glm::quat(), relDefaultPose.trans() + boneLengthScale * (hfmAnimTrans - hfmZeroTrans));
 
                 _anim[frame][skeletonJoint] = trans * preRot * rot * postRot;
             }
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index bed9c590be..fc4114ac7b 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -16,17 +16,17 @@
 
 #include "AnimationLogging.h"
 
-AnimSkeleton::AnimSkeleton(const FBXGeometry& fbxGeometry) {
+AnimSkeleton::AnimSkeleton(const HFMGeometry& geometry) {
     // convert to std::vector of joints
-    std::vector<FBXJoint> joints;
-    joints.reserve(fbxGeometry.joints.size());
-    for (auto& joint : fbxGeometry.joints) {
+    std::vector<HFMJoint> joints;
+    joints.reserve(geometry.joints.size());
+    for (auto& joint : geometry.joints) {
         joints.push_back(joint);
     }
     buildSkeletonFromJoints(joints);
 }
 
-AnimSkeleton::AnimSkeleton(const std::vector<FBXJoint>& joints) {
+AnimSkeleton::AnimSkeleton(const std::vector<HFMJoint>& joints) {
     buildSkeletonFromJoints(joints);
 }
 
@@ -166,7 +166,7 @@ void AnimSkeleton::mirrorAbsolutePoses(AnimPoseVec& poses) const {
     }
 }
 
-void AnimSkeleton::buildSkeletonFromJoints(const std::vector<FBXJoint>& joints) {
+void AnimSkeleton::buildSkeletonFromJoints(const std::vector<HFMJoint>& joints) {
     _joints = joints;
     _jointsSize = (int)joints.size();
     // build a cache of bind poses
@@ -177,7 +177,7 @@ void AnimSkeleton::buildSkeletonFromJoints(const std::vector<FBXJoint>& joints)
     _relativePreRotationPoses.reserve(_jointsSize);
     _relativePostRotationPoses.reserve(_jointsSize);
 
-    // iterate over FBXJoints and extract the bind pose information.
+    // iterate over HFMJoints and extract the bind pose information.
     for (int i = 0; i < _jointsSize; i++) {
 
         // build pre and post transforms
@@ -240,7 +240,7 @@ void AnimSkeleton::dump(bool verbose) const {
         qCDebug(animation) << "        absDefaultPose =" << getAbsoluteDefaultPose(i);
         qCDebug(animation) << "        relDefaultPose =" << getRelativeDefaultPose(i);
         if (verbose) {
-            qCDebug(animation) << "        fbxJoint =";
+            qCDebug(animation) << "        hfmJoint =";
             qCDebug(animation) << "            isFree =" << _joints[i].isFree;
             qCDebug(animation) << "            freeLineage =" << _joints[i].freeLineage;
             qCDebug(animation) << "            parentIndex =" << _joints[i].parentIndex;
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 2ebf3f4f5d..1717d75985 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -23,8 +23,8 @@ public:
     using Pointer = std::shared_ptr<AnimSkeleton>;
     using ConstPointer = std::shared_ptr<const AnimSkeleton>;
 
-    explicit AnimSkeleton(const FBXGeometry& fbxGeometry);
-    explicit AnimSkeleton(const std::vector<FBXJoint>& joints);
+    explicit AnimSkeleton(const HFMGeometry& geometry);
+    explicit AnimSkeleton(const std::vector<HFMJoint>& joints);
     int nameToJointIndex(const QString& jointName) const;
     const QString& getJointName(int jointIndex) const;
     int getNumJoints() const;
@@ -64,9 +64,9 @@ public:
     std::vector<int> lookUpJointIndices(const std::vector<QString>& jointNames) const;
 
 protected:
-    void buildSkeletonFromJoints(const std::vector<FBXJoint>& joints);
+    void buildSkeletonFromJoints(const std::vector<HFMJoint>& joints);
 
-    std::vector<FBXJoint> _joints;
+    std::vector<HFMJoint> _joints;
     int _jointsSize { 0 };
     AnimPoseVec _relativeDefaultPoses;
     AnimPoseVec _absoluteDefaultPoses;
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index 04b7952ddb..b5b27c3a24 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -69,7 +69,7 @@ void AnimationReader::run() {
 
         if (urlValid) {
             // Parse the FBX directly from the QNetworkReply
-            FBXGeometry::Pointer fbxgeo;
+            HFMGeometry::Pointer fbxgeo;
             if (_url.path().toLower().endsWith(".fbx")) {
                 fbxgeo.reset(readFBX(_data, QVariantHash(), _url.path()));
             } else {
@@ -100,40 +100,40 @@ QStringList Animation::getJointNames() const {
     }
     QStringList names;
     if (_geometry) {
-        foreach (const FBXJoint& joint, _geometry->joints) {
+        foreach (const HFMJoint& joint, _geometry->joints) {
             names.append(joint.name);
         }
     }
     return names;
 }
 
-QVector<FBXAnimationFrame> Animation::getFrames() const {
+QVector<HFMAnimationFrame> Animation::getFrames() const {
     if (QThread::currentThread() != thread()) {
-        QVector<FBXAnimationFrame> result;
+        QVector<HFMAnimationFrame> result;
         BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getFrames",
-            Q_RETURN_ARG(QVector<FBXAnimationFrame>, result));
+            Q_RETURN_ARG(QVector<HFMAnimationFrame>, result));
         return result;
     }
     if (_geometry) {
         return _geometry->animationFrames;
     } else {
-        return QVector<FBXAnimationFrame>();
+        return QVector<HFMAnimationFrame>();
     }
 }
 
-const QVector<FBXAnimationFrame>& Animation::getFramesReference() const {
+const QVector<HFMAnimationFrame>& Animation::getFramesReference() const {
     return _geometry->animationFrames;
 }
 
 void Animation::downloadFinished(const QByteArray& data) {
     // parse the animation/fbx file on a background thread.
     AnimationReader* animationReader = new AnimationReader(_url, data);
-    connect(animationReader, SIGNAL(onSuccess(FBXGeometry::Pointer)), SLOT(animationParseSuccess(FBXGeometry::Pointer)));
+    connect(animationReader, SIGNAL(onSuccess(HFMGeometry::Pointer)), SLOT(animationParseSuccess(HFMGeometry::Pointer)));
     connect(animationReader, SIGNAL(onError(int, QString)), SLOT(animationParseError(int, QString)));
     QThreadPool::globalInstance()->start(animationReader);
 }
 
-void Animation::animationParseSuccess(FBXGeometry::Pointer geometry) {
+void Animation::animationParseSuccess(HFMGeometry::Pointer geometry) {
 
     qCDebug(animation) << "Animation parse success" << _url.toDisplayString();
 
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index 483350e2b5..302f23a4e7 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -66,7 +66,7 @@ public:
 
     QString getType() const override { return "Animation"; }
 
-    const FBXGeometry& getGeometry() const { return *_geometry; }
+    const HFMGeometry& getGeometry() const { return *_geometry; }
 
     virtual bool isLoaded() const override;
 
@@ -80,20 +80,20 @@ public:
      * @function AnimationObject.getFrames
      * @returns {FBXAnimationFrame[]}
      */
-    Q_INVOKABLE QVector<FBXAnimationFrame> getFrames() const;
+    Q_INVOKABLE QVector<HFMAnimationFrame> getFrames() const;
 
-    const QVector<FBXAnimationFrame>& getFramesReference() const;
+    const QVector<HFMAnimationFrame>& getFramesReference() const;
     
 protected:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected slots:
-    void animationParseSuccess(FBXGeometry::Pointer geometry);
+    void animationParseSuccess(HFMGeometry::Pointer geometry);
     void animationParseError(int error, QString str);
 
 private:
     
-    FBXGeometry::Pointer _geometry;
+    HFMGeometry::Pointer _geometry;
 };
 
 /// Reads geometry in a worker thread.
@@ -105,7 +105,7 @@ public:
     virtual void run() override;
 
 signals:
-    void onSuccess(FBXGeometry::Pointer geometry);
+    void onSuccess(HFMGeometry::Pointer geometry);
     void onError(int error, QString str);
 
 private:
diff --git a/libraries/animation/src/AnimationObject.cpp b/libraries/animation/src/AnimationObject.cpp
index 7f0f35b104..bcbf497199 100644
--- a/libraries/animation/src/AnimationObject.cpp
+++ b/libraries/animation/src/AnimationObject.cpp
@@ -19,17 +19,17 @@ QStringList AnimationObject::getJointNames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getJointNames();
 }
 
-QVector<FBXAnimationFrame> AnimationObject::getFrames() const {
+QVector<HFMAnimationFrame> AnimationObject::getFrames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getFrames();
 }
 
 QVector<glm::quat> AnimationFrameObject::getRotations() const {
-    return qscriptvalue_cast<FBXAnimationFrame>(thisObject()).rotations;
+    return qscriptvalue_cast<HFMAnimationFrame>(thisObject()).rotations;
 }
 
 void registerAnimationTypes(QScriptEngine* engine) {
-    qScriptRegisterSequenceMetaType<QVector<FBXAnimationFrame> >(engine);
-    engine->setDefaultPrototype(qMetaTypeId<FBXAnimationFrame>(), engine->newQObject(
+    qScriptRegisterSequenceMetaType<QVector<HFMAnimationFrame> >(engine);
+    engine->setDefaultPrototype(qMetaTypeId<HFMAnimationFrame>(), engine->newQObject(
         new AnimationFrameObject(), QScriptEngine::ScriptOwnership));
     engine->setDefaultPrototype(qMetaTypeId<AnimationPointer>(), engine->newQObject(
         new AnimationObject(), QScriptEngine::ScriptOwnership));
diff --git a/libraries/animation/src/AnimationObject.h b/libraries/animation/src/AnimationObject.h
index aa69e78ceb..83880ed2ab 100644
--- a/libraries/animation/src/AnimationObject.h
+++ b/libraries/animation/src/AnimationObject.h
@@ -23,13 +23,13 @@ class QScriptEngine;
 class AnimationObject : public QObject, protected QScriptable {
     Q_OBJECT
     Q_PROPERTY(QStringList jointNames READ getJointNames)
-    Q_PROPERTY(QVector<FBXAnimationFrame> frames READ getFrames)
+    Q_PROPERTY(QVector<HFMAnimationFrame> frames READ getFrames)
 
 public:
     
     Q_INVOKABLE QStringList getJointNames() const;
     
-    Q_INVOKABLE QVector<FBXAnimationFrame> getFrames() const;
+    Q_INVOKABLE QVector<HFMAnimationFrame> getFrames() const;
 };
 
 /// Scriptable wrapper for animation frames.
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 33b9569758..2641be92da 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -260,7 +260,7 @@ void Rig::destroyAnimGraph() {
     _rightEyeJointChildren.clear();
 }
 
-void Rig::initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset) {
+void Rig::initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset) {
     _geometryOffset = AnimPose(geometry.offset);
     _invGeometryOffset = _geometryOffset.inverse();
     _geometryToRigTransform = modelOffset * geometry.offset;
@@ -307,7 +307,7 @@ void Rig::initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOff
     _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.rightEyeJointIndex);
 }
 
-void Rig::reset(const FBXGeometry& geometry) {
+void Rig::reset(const HFMGeometry& geometry) {
     _geometryOffset = AnimPose(geometry.offset);
     _invGeometryOffset = _geometryOffset.inverse();
     _animSkeleton = std::make_shared<AnimSkeleton>(geometry);
@@ -1253,7 +1253,7 @@ const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
 // returns true if the given point lies inside of the k-dop, specified by shapeInfo & shapePose.
 // if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward
 // such that it lies on the surface of the kdop.
-static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
+static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const HFMJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
 
     // transform point into local space of jointShape.
     glm::vec3 localPoint = shapePose.inverse().xformPoint(point);
@@ -1299,8 +1299,8 @@ static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& sh
     }
 }
 
-glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                                    const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const {
+glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                                    const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo) const {
     glm::vec3 position = handPosition;
     glm::vec3 displacement;
     int hipsJoint = indexOfJoint("Hips");
@@ -1349,8 +1349,8 @@ glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJoin
 void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
                       bool leftArmEnabled, bool rightArmEnabled, bool headEnabled, float dt,
                       const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                      const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                      const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo,
+                      const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                      const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo,
                       const glm::mat4& rigToSensorMatrix, const glm::mat4& sensorToRigMatrix) {
 
     const bool ENABLE_POLE_VECTORS = true;
@@ -2008,7 +2008,7 @@ void Rig::computeExternalPoses(const glm::mat4& modelOffsetMat) {
 }
 
 void Rig::computeAvatarBoundingCapsule(
-        const FBXGeometry& geometry,
+        const HFMGeometry& geometry,
         float& radiusOut,
         float& heightOut,
         glm::vec3& localOffsetOut) const {
@@ -2041,7 +2041,7 @@ void Rig::computeAvatarBoundingCapsule(
     // from the head to the hips when computing the rest of the bounding capsule.
     int index = indexOfJoint("Head");
     while (index != -1) {
-        const FBXJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
+        const HFMJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
         AnimPose pose = _animSkeleton->getAbsoluteDefaultPose(index);
         if (shapeInfo.points.size() > 0) {
             for (auto& point : shapeInfo.points) {
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 7a090bd7bd..61e8672972 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -86,10 +86,10 @@ public:
         AnimPose secondaryControllerPoses[NumSecondaryControllerTypes];  // rig space
         uint8_t secondaryControllerFlags[NumSecondaryControllerTypes];
         bool isTalking;
-        FBXJointShapeInfo hipsShapeInfo;
-        FBXJointShapeInfo spineShapeInfo;
-        FBXJointShapeInfo spine1ShapeInfo;
-        FBXJointShapeInfo spine2ShapeInfo;
+        HFMJointShapeInfo hipsShapeInfo;
+        HFMJointShapeInfo spineShapeInfo;
+        HFMJointShapeInfo spine1ShapeInfo;
+        HFMJointShapeInfo spine2ShapeInfo;
     };
 
     struct EyeParameters {
@@ -122,8 +122,8 @@ public:
     void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
     void restoreRoleAnimation(const QString& role);
 
-    void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
-    void reset(const FBXGeometry& geometry);
+    void initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset);
+    void reset(const HFMGeometry& geometry);
     bool jointStatesEmpty();
     int getJointStateCount() const;
     int indexOfJoint(const QString& jointName) const;
@@ -210,7 +210,7 @@ public:
     void copyJointsFromJointData(const QVector<JointData>& jointDataVec);
     void computeExternalPoses(const glm::mat4& modelOffsetMat);
 
-    void computeAvatarBoundingCapsule(const FBXGeometry& geometry, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
+    void computeAvatarBoundingCapsule(const HFMGeometry& geometry, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
 
     void setEnableInverseKinematics(bool enable);
     void setEnableAnimations(bool enable);
@@ -245,8 +245,8 @@ protected:
     void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
                      bool leftArmEnabled, bool rightArmEnabled, bool headEnabled, float dt,
                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                     const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                     const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo,
+                     const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                     const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo,
                      const glm::mat4& rigToSensorMatrix, const glm::mat4& sensorToRigMatrix);
     void updateFeet(bool leftFootEnabled, bool rightFootEnabled, bool headEnabled,
                     const AnimPose& leftFootPose, const AnimPose& rightFootPose,
@@ -257,8 +257,8 @@ protected:
 
     bool calculateElbowPoleVector(int handIndex, int elbowIndex, int armIndex, int oppositeArmIndex, glm::vec3& poleVector) const;
     glm::vec3 calculateKneePoleVector(int footJointIndex, int kneeJoint, int upLegIndex, int hipsIndex, const AnimPose& targetFootPose) const;
-    glm::vec3 deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                                   const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const;
+    glm::vec3 deflectHandFromTorso(const glm::vec3& handPosition, const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                                   const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo) const;
 
 
     AnimPose _modelOffset;  // model to rig space
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 86f5bd69a5..b8448e389d 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1311,7 +1311,7 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::quat rotation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
                 }
@@ -1360,7 +1360,7 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::vec3 translation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
                 }
@@ -1416,7 +1416,7 @@ void Avatar::withValidJointIndicesCache(std::function<void()> const& worker) con
             if (!_modelJointsCached) {
                 _modelJointIndicesCache.clear();
                 if (_skeletonModel && _skeletonModel->isActive()) {
-                    _modelJointIndicesCache = _skeletonModel->getFBXGeometry().jointIndices;
+                    _modelJointIndicesCache = _skeletonModel->getHFMGeometry().jointIndices;
                     _modelJointsCached = true;
                 }
             }
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 1ec58fd704..a41cff528b 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -54,7 +54,7 @@ void SkeletonModel::setTextures(const QVariantMap& textures) {
 }
 
 void SkeletonModel::initJointStates() {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
     _rig.initJointStates(geometry, modelOffset);
 
@@ -96,7 +96,7 @@ void SkeletonModel::initJointStates() {
 // Called within Model::simulate call, below.
 void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     assert(!_owningAvatar->isMyAvatar());
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     Head* head = _owningAvatar->getHead();
 
@@ -259,22 +259,22 @@ bool SkeletonModel::getRightShoulderPosition(glm::vec3& position) const {
 }
 
 bool SkeletonModel::getHeadPosition(glm::vec3& headPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getFBXGeometry().headJointIndex, headPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().headJointIndex, headPosition);
 }
 
 bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getFBXGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getLocalNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPosition(getFBXGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPosition(getHFMGeometry().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getEyeModelPositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
     if (!isActive()) {
         return false;
     }
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     if (getJointPosition(geometry.leftEyeJointIndex, firstEyePosition) &&
         getJointPosition(geometry.rightEyeJointIndex, secondEyePosition)) {
@@ -330,7 +330,7 @@ void SkeletonModel::computeBoundingShape() {
         return;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     if (geometry.joints.isEmpty() || geometry.rootJointIndex == -1) {
         // rootJointIndex == -1 if the avatar model has no skeleton
         return;
@@ -369,7 +369,7 @@ void SkeletonModel::renderBoundingCollisionShapes(RenderArgs* args, gpu::Batch&
 }
 
 bool SkeletonModel::hasSkeleton() {
-    return isActive() ? getFBXGeometry().rootJointIndex != -1 : false;
+    return isActive() ? getHFMGeometry().rootJointIndex != -1 : false;
 }
 
 void SkeletonModel::onInvalidate() {
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
index d82fce7412..6c533a5941 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
@@ -41,10 +41,10 @@ public:
     void updateAttitude(const glm::quat& orientation);
 
     /// Returns the index of the left hand joint, or -1 if not found.
-    int getLeftHandJointIndex() const { return isActive() ? getFBXGeometry().leftHandJointIndex : -1; }
+    int getLeftHandJointIndex() const { return isActive() ? getHFMGeometry().leftHandJointIndex : -1; }
 
     /// Returns the index of the right hand joint, or -1 if not found.
-    int getRightHandJointIndex() const { return isActive() ? getFBXGeometry().rightHandJointIndex : -1; }
+    int getRightHandJointIndex() const { return isActive() ? getHFMGeometry().rightHandJointIndex : -1; }
 
     bool getLeftGrabPosition(glm::vec3& position) const;
     bool getRightGrabPosition(glm::vec3& position) const;
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index b90082d969..0b76c275d4 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -206,7 +206,7 @@ void FBXBaker::importScene() {
     }
 #endif
 
-    _geometry = reader.extractFBXGeometry({}, _modelURL.toString());
+    _geometry = reader.extractHFMGeometry({}, _modelURL.toString());
     _textureContentMap = reader._textureContent;
 }
 
@@ -329,7 +329,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                     for (FBXNode& textureChild : object->children) {
 
                         if (textureChild.name == "RelativeFilename") {
-                            QString fbxTextureFileName { textureChild.properties.at(0).toString() };
+                            QString hfmTextureFileName { textureChild.properties.at(0).toString() };
                             
                             // grab the ID for this texture so we can figure out the
                             // texture type from the loaded materials
@@ -337,7 +337,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                             auto textureType = textureTypes[textureID];
 
                             // Compress the texture information and return the new filename to be added into the FBX scene
-                            auto bakedTextureFile = compressTexture(fbxTextureFileName, textureType);
+                            auto bakedTextureFile = compressTexture(hfmTextureFileName, textureType);
 
                             // If no errors or warnings have occurred during texture compression add the filename to the FBX scene
                             if (!bakedTextureFile.isNull()) {
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 9d41209d4c..8edaf91c79 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -53,7 +53,7 @@ private:
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
 
-    FBXGeometry* _geometry;
+    HFMGeometry* _geometry;
     QHash<QString, int> _textureNameMatchCount;
     QHash<QUrl, QString> _remappedTexturePaths;
 
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 75e10c54ab..ca352cebae 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -75,7 +75,7 @@ void ModelBaker::abort() {
     }
 }
 
-bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback) {
+bool ModelBaker::compressMesh(HFMMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback) {
     if (mesh.wasCompressed) {
         handleError("Cannot re-bake a file that contains compressed mesh");
         return false;
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index 1fd77ab761..cda4478b1d 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -39,7 +39,7 @@ public:
                const QString& bakedOutputDirectory, const QString& originalOutputDirectory = "");
     virtual ~ModelBaker();
 
-    bool compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback = nullptr);
+    bool compressMesh(HFMMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback = nullptr);
     QString compressTexture(QString textureFileName, image::TextureUsage::Type = image::TextureUsage::Type::DEFAULT_TEXTURE);
     virtual void setWasAborted(bool wasAborted) override;
 
diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index cf62bc4fa8..e9130e3fbd 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -153,7 +153,7 @@ void OBJBaker::bakeOBJ() {
     checkIfTexturesFinished();
 }
 
-void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
+void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
     // Generating FBX Header Node
     FBXNode headerNode;
     headerNode.name = FBX_HEADER_EXTENSION;
@@ -235,7 +235,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     auto size = meshParts.size();
     for (int i = 0; i < size; i++) {
         QString material = meshParts[i].materialID;
-        FBXMaterial currentMaterial = geometry.materials[material];
+        HFMMaterial currentMaterial = geometry.materials[material];
         if (!currentMaterial.albedoTexture.filename.isEmpty() || !currentMaterial.specularTexture.filename.isEmpty()) {
             auto textureID = nextNodeID();
             _mapTextureMaterial.emplace_back(textureID, i);
@@ -325,12 +325,12 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
 }
 
 // Set properties for material nodes
-void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, FBXGeometry& geometry) {
+void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry) {
     auto materialID = nextNodeID();
     _materialIDs.push_back(materialID);
     materialNode.properties = { materialID, material, MESH };
 
-    FBXMaterial currentMaterial = geometry.materials[material];
+    HFMMaterial currentMaterial = geometry.materials[material];
 
     // Setting the hierarchy: Material -> Properties70 -> P -> Properties
     FBXNode properties70Node;
diff --git a/libraries/baking/src/OBJBaker.h b/libraries/baking/src/OBJBaker.h
index 8e49692d35..875a500129 100644
--- a/libraries/baking/src/OBJBaker.h
+++ b/libraries/baking/src/OBJBaker.h
@@ -39,8 +39,8 @@ private slots:
 
 private:
     void loadOBJ();
-    void createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry);
-    void setMaterialNodeProperties(FBXNode& materialNode, QString material, FBXGeometry& geometry);
+    void createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry);
+    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry);
     NodeID nextNodeID() { return _nodeID++; }
 
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c6337dc872..c36f60600f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -268,7 +268,7 @@ EntityItemProperties RenderableModelEntityItem::getProperties(const EntityProper
         if (model->isLoaded()) {
             // TODO: improve naturalDimensions in the future,
             //       for now we've added this hack for setting natural dimensions of models
-            Extents meshExtents = model->getFBXGeometry().getUnscaledMeshExtents();
+            Extents meshExtents = model->getHFMGeometry().getUnscaledMeshExtents();
             properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
             properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
         }
@@ -403,7 +403,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const FBXGeometry& collisionGeometry = _compoundShapeResource->getFBXGeometry();
+        const HFMGeometry& collisionGeometry = _compoundShapeResource->getHFMGeometry();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -411,15 +411,15 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
         // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
-        foreach (const FBXMesh& mesh, collisionGeometry.meshes) {
+        foreach (const HFMMesh& mesh, collisionGeometry.meshes) {
             // each meshPart is a convex hull
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 pointCollection.push_back(QVector<glm::vec3>());
                 ShapeInfo::PointList& pointsInPart = pointCollection[i];
 
                 // run through all the triangles and (uniquely) add each point to the hull
                 uint32_t numIndices = (uint32_t)meshPart.triangleIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % TRIANGLE_STRIDE == 0);
                 numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -440,7 +440,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
                 // run through all the quads and (uniquely) add each point to the hull
                 numIndices = (uint32_t)meshPart.quadIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % QUAD_STRIDE == 0);
                 numIndices -= numIndices % QUAD_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -478,7 +478,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / model->getFBXGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / model->getHFMGeometry().getUnscaledMeshExtents().size();
         // multiply each point by scale before handing the point-set off to the physics engine.
         // also determine the extents of the collision model.
         glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint());
@@ -498,14 +498,14 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         // compute meshPart local transforms
         QVector<glm::mat4> localTransforms;
-        const FBXGeometry& fbxGeometry = model->getFBXGeometry();
-        int numFbxMeshes = fbxGeometry.meshes.size();
+        const HFMGeometry& hfmGeometry = model->getHFMGeometry();
+        int numHFMMeshes = hfmGeometry.meshes.size();
         int totalNumVertices = 0;
         glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
-        for (int i = 0; i < numFbxMeshes; i++) {
-            const FBXMesh& mesh = fbxGeometry.meshes.at(i);
+        for (int i = 0; i < numHFMMeshes; i++) {
+            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
             if (mesh.clusters.size() > 0) {
-                const FBXCluster& cluster = mesh.clusters.at(0);
+                const HFMCluster& cluster = mesh.clusters.at(0);
                 auto jointMatrix = model->getRig().getJointTransform(cluster.jointIndex);
                 // we backtranslate by the registration offset so we can apply that offset to the shapeInfo later
                 localTransforms.push_back(invRegistraionOffset * jointMatrix * cluster.inverseBindMatrix);
@@ -524,10 +524,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         std::vector<std::shared_ptr<const graphics::Mesh>> meshes;
         if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
-            auto& fbxMeshes = _compoundShapeResource->getFBXGeometry().meshes;
-            meshes.reserve(fbxMeshes.size());
-            for (auto& fbxMesh : fbxMeshes) {
-                meshes.push_back(fbxMesh._mesh);
+            auto& hfmMeshes = _compoundShapeResource->getHFMGeometry().meshes;
+            meshes.reserve(hfmMeshes.size());
+            for (auto& hfmMesh : hfmMeshes) {
+                meshes.push_back(hfmMesh._mesh);
             }
         } else {
             meshes = model->getGeometry()->getMeshes();
@@ -594,7 +594,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                 while (partItr != parts.cend<const graphics::Mesh::Part>()) {
                     auto numIndices = partItr->_numIndices;
                     if (partItr->_topology == graphics::Mesh::TRIANGLES) {
-                        // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                        // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                         //assert(numIndices % TRIANGLE_STRIDE == 0);
                         numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -605,7 +605,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                             ++indexItr;
                         }
                     } else if (partItr->_topology == graphics::Mesh::TRIANGLE_STRIP) {
-                        // TODO: resurrect assert after we start sanitizing FBXMesh higher up
+                        // TODO: resurrect assert after we start sanitizing HFMMesh higher up
                         //assert(numIndices > 2);
 
                         uint32_t approxNumIndices = TRIANGLE_STRIDE * numIndices;
@@ -651,7 +651,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                     std::set<int32_t> uniqueIndices;
                     auto numIndices = partItr->_numIndices;
                     if (partItr->_topology == graphics::Mesh::TRIANGLES) {
-                        // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                        // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                         //assert(numIndices% TRIANGLE_STRIDE == 0);
                         numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -662,7 +662,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                             ++indexItr;
                         }
                     } else if (partItr->_topology == graphics::Mesh::TRIANGLE_STRIP) {
-                        // TODO: resurrect assert after we start sanitizing FBXMesh higher up
+                        // TODO: resurrect assert after we start sanitizing HFMMesh higher up
                         //assert(numIndices > TRIANGLE_STRIDE - 1);
 
                         auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex;
@@ -755,7 +755,7 @@ int RenderableModelEntityItem::avatarJointIndex(int modelJointIndex) {
 bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
     auto model = getModel();
     if (EntityItem::contains(point) && model && _compoundShapeResource && _compoundShapeResource->isLoaded()) {
-        return _compoundShapeResource->getFBXGeometry().convexHullContains(worldToEntity(point));
+        return _compoundShapeResource->getHFMGeometry().convexHullContains(worldToEntity(point));
     }
 
     return false;
@@ -1135,7 +1135,7 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
 
     QVector<EntityJointData> jointsData;
 
-    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    const QVector<HFMAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
     int frameCount = frames.size();
     if (frameCount <= 0) {
         return;
@@ -1160,10 +1160,10 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     }
 
     QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& fbxJoints = _animation->getGeometry().joints;
+    auto& hfmJoints = _animation->getGeometry().joints;
 
-    auto& originalFbxJoints = _model->getFBXGeometry().joints;
-    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMGeometry().joints;
+    auto& originalHFMIndices = _model->getHFMGeometry().jointIndices;
 
     bool allowTranslation = entity->getAnimationAllowTranslation();
 
@@ -1182,22 +1182,22 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
                     translationMat = glm::translate(translations[index]);
                 }
             } else if (index < animationJointNames.size()) {
-                QString jointName = fbxJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
-                if (originalFbxIndices.contains(jointName)) {
+                QString jointName = hfmJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
+                if (originalHFMIndices.contains(jointName)) {
                     // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get it's translation.
-                    int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
-                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                    int remappedIndex = originalHFMIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
+                    translationMat = glm::translate(originalHFMJoints[remappedIndex].translation);
                 }
             }
             glm::mat4 rotationMat;
             if (index < rotations.size()) {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * rotations[index] * hfmJoints[index].postRotation);
             } else {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * hfmJoints[index].postRotation);
             }
 
-            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
-                rotationMat * fbxJoints[index].postTransform);
+            glm::mat4 finalMat = (translationMat * hfmJoints[index].preTransform *
+                rotationMat * hfmJoints[index].postTransform);
             auto& jointData = jointsData[j];
             jointData.translation = extractTranslation(finalMat);
             jointData.translationSet = true;
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index fdebb16bc8..8051dbafea 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -70,8 +70,8 @@ public:
 };
 
 
-/// A single blendshape extracted from an FBX document.
-class FBXBlendshape {
+/// A single blendshape.
+class HFMBlendshape {
 public:
     QVector<int> indices;
     QVector<glm::vec3> vertices;
@@ -79,19 +79,19 @@ public:
     QVector<glm::vec3> tangents;
 };
 
-struct FBXJointShapeInfo {
-    // same units and frame as FBXJoint.translation
+struct HFMJointShapeInfo {
+    // same units and frame as HFMJoint.translation
     glm::vec3 avgPoint;
     std::vector<float> dots;
     std::vector<glm::vec3> points;
     std::vector<glm::vec3> debugLines;
 };
 
-/// A single joint (transformation node) extracted from an FBX document.
-class FBXJoint {
+/// A single joint (transformation node).
+class HFMJoint {
 public:
 
-    FBXJointShapeInfo shapeInfo;
+    HFMJointShapeInfo shapeInfo;
     QVector<int> freeLineage;
     bool isFree;
     int parentIndex;
@@ -126,8 +126,8 @@ public:
 };
 
 
-/// A single binding to a joint in an FBX document.
-class FBXCluster {
+/// A single binding to a joint.
+class HFMCluster {
 public:
 
     int jointIndex;
@@ -137,8 +137,8 @@ public:
 
 const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
 
-/// A texture map in an FBX document.
-class FBXTexture {
+/// A texture map.
+class HFMTexture {
 public:
     QString id;
     QString name;
@@ -156,7 +156,7 @@ public:
 };
 
 /// A single part of a mesh (with the same material).
-class FBXMeshPart {
+class HFMMeshPart {
 public:
 
     QVector<int> quadIndices; // original indices from the FBX mesh
@@ -166,10 +166,10 @@ public:
     QString materialID;
 };
 
-class FBXMaterial {
+class HFMMaterial {
 public:
-    FBXMaterial() {};
-    FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
+    HFMMaterial() {};
+    HFMMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
          float shininess, float opacity) :
         diffuseColor(diffuseColor),
         specularColor(specularColor),
@@ -203,17 +203,17 @@ public:
     QString shadingModel;
     graphics::MaterialPointer _material;
 
-    FBXTexture normalTexture;
-    FBXTexture albedoTexture;
-    FBXTexture opacityTexture;
-    FBXTexture glossTexture;
-    FBXTexture roughnessTexture;
-    FBXTexture specularTexture;
-    FBXTexture metallicTexture;
-    FBXTexture emissiveTexture;
-    FBXTexture occlusionTexture;
-    FBXTexture scatteringTexture;
-    FBXTexture lightmapTexture;
+    HFMTexture normalTexture;
+    HFMTexture albedoTexture;
+    HFMTexture opacityTexture;
+    HFMTexture glossTexture;
+    HFMTexture roughnessTexture;
+    HFMTexture specularTexture;
+    HFMTexture metallicTexture;
+    HFMTexture emissiveTexture;
+    HFMTexture occlusionTexture;
+    HFMTexture scatteringTexture;
+    HFMTexture lightmapTexture;
     glm::vec2 lightmapParams{ 0.0f, 1.0f };
 
 
@@ -232,10 +232,10 @@ public:
 };
 
 /// A single mesh (with optional blendshapes) extracted from an FBX document.
-class FBXMesh {
+class HFMMesh {
 public:
 
-    QVector<FBXMeshPart> parts;
+    QVector<HFMMeshPart> parts;
 
     QVector<glm::vec3> vertices;
     QVector<glm::vec3> normals;
@@ -247,12 +247,12 @@ public:
     QVector<uint16_t> clusterWeights;
     QVector<int32_t> originalIndices;
 
-    QVector<FBXCluster> clusters;
+    QVector<HFMCluster> clusters;
 
     Extents meshExtents;
     glm::mat4 modelTransform;
 
-    QVector<FBXBlendshape> blendshapes;
+    QVector<HFMBlendshape> blendshapes;
 
     unsigned int meshIndex; // the order the meshes appeared in the object file
 
@@ -265,7 +265,7 @@ public:
 
 class ExtractedMesh {
 public:
-    FBXMesh mesh;
+    HFMMesh mesh;
     QMultiHash<int, int> newIndices;
     QVector<QHash<int, int> > blendshapeIndexMaps;
     QVector<QPair<int, int> > partMaterialTextures;
@@ -278,14 +278,14 @@ public:
  * @property {Vec3[]} translations
  */
 /// A single animation frame extracted from an FBX document.
-class FBXAnimationFrame {
+class HFMAnimationFrame {
 public:
     QVector<glm::quat> rotations;
     QVector<glm::vec3> translations;
 };
 
-/// A light in an FBX document.
-class FBXLight {
+/// A light.
+class HFMLight {
 public:
     QString name;
     Transform transform;
@@ -293,7 +293,7 @@ public:
     float fogValue;
     glm::vec3 color;
 
-    FBXLight() :
+    HFMLight() :
         name(),
         transform(),
         intensity(1.0f),
@@ -302,26 +302,26 @@ public:
     {}
 };
 
-Q_DECLARE_METATYPE(FBXAnimationFrame)
-Q_DECLARE_METATYPE(QVector<FBXAnimationFrame>)
+Q_DECLARE_METATYPE(HFMAnimationFrame)
+Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
 
 /// A set of meshes extracted from an FBX document.
-class FBXGeometry {
+class HFMGeometry {
 public:
-    using Pointer = std::shared_ptr<FBXGeometry>;
+    using Pointer = std::shared_ptr<HFMGeometry>;
 
     QString originalURL;
     QString author;
     QString applicationName; ///< the name of the application that generated the model
 
-    QVector<FBXJoint> joints;
+    QVector<HFMJoint> joints;
     QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
     bool hasSkeletonJoints;
 
-    QVector<FBXMesh> meshes;
+    QVector<HFMMesh> meshes;
     QVector<QString> scripts;
 
-    QHash<QString, FBXMaterial> materials;
+    QHash<QString, HFMMaterial> materials;
 
     glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
 
@@ -348,7 +348,7 @@ public:
     Extents bindExtents;
     Extents meshExtents;
 
-    QVector<FBXAnimationFrame> animationFrames;
+    QVector<HFMAnimationFrame> animationFrames;
 
     int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
     QStringList getJointNames() const;
@@ -368,7 +368,7 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(FBXGeometry)
-Q_DECLARE_METATYPE(FBXGeometry::Pointer)
+Q_DECLARE_METATYPE(HFMGeometry)
+Q_DECLARE_METATYPE(HFMGeometry::Pointer)
 
 #endif // hifi_FBX_h_
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index dd766f002c..df6abbfdf2 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -40,19 +40,19 @@
 
 using namespace std;
 
-int FBXGeometryPointerMetaTypeId = qRegisterMetaType<FBXGeometry::Pointer>();
+int HFMGeometryPointerMetaTypeId = qRegisterMetaType<HFMGeometry::Pointer>();
 
-QStringList FBXGeometry::getJointNames() const {
+QStringList HFMGeometry::getJointNames() const {
     QStringList names;
-    foreach (const FBXJoint& joint, joints) {
+    foreach (const HFMJoint& joint, joints) {
         names.append(joint.name);
     }
     return names;
 }
 
-bool FBXGeometry::hasBlendedMeshes() const {
+bool HFMGeometry::hasBlendedMeshes() const {
     if (!meshes.isEmpty()) {
-        foreach (const FBXMesh& mesh, meshes) {
+        foreach (const HFMMesh& mesh, meshes) {
             if (!mesh.blendshapes.isEmpty()) {
                 return true;
             }
@@ -61,7 +61,7 @@ bool FBXGeometry::hasBlendedMeshes() const {
     return false;
 }
 
-Extents FBXGeometry::getUnscaledMeshExtents() const {
+Extents HFMGeometry::getUnscaledMeshExtents() const {
     const Extents& extents = meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
@@ -74,12 +74,12 @@ Extents FBXGeometry::getUnscaledMeshExtents() const {
 }
 
 // TODO: Move to graphics::Mesh when Sam's ready
-bool FBXGeometry::convexHullContains(const glm::vec3& point) const {
+bool HFMGeometry::convexHullContains(const glm::vec3& point) const {
     if (!getUnscaledMeshExtents().containsPoint(point)) {
         return false;
     }
 
-    auto checkEachPrimitive = [=](FBXMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
+    auto checkEachPrimitive = [=](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
         // Check whether the point is "behind" all the primitives.
         int verticesSize = mesh.vertices.size();
         for (int j = 0;
@@ -124,16 +124,16 @@ bool FBXGeometry::convexHullContains(const glm::vec3& point) const {
     return false;
 }
 
-QString FBXGeometry::getModelNameOfMesh(int meshIndex) const {
+QString HFMGeometry::getModelNameOfMesh(int meshIndex) const {
     if (meshIndicesToModelNames.contains(meshIndex)) {
         return meshIndicesToModelNames.value(meshIndex);
     }
     return QString();
 }
 
-int fbxGeometryMetaTypeId = qRegisterMetaType<FBXGeometry>();
-int fbxAnimationFrameMetaTypeId = qRegisterMetaType<FBXAnimationFrame>();
-int fbxAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<FBXAnimationFrame> >();
+int hfmGeometryMetaTypeId = qRegisterMetaType<HFMGeometry>();
+int hfmAnimationFrameMetaTypeId = qRegisterMetaType<HFMAnimationFrame>();
+int hfmAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<HFMAnimationFrame> >();
 
 
 glm::vec3 parseVec3(const QString& string) {
@@ -303,7 +303,7 @@ glm::mat4 getGlobalTransform(const QMultiMap<QString, QString>& _connectionParen
 class ExtractedBlendshape {
 public:
     QString id;
-    FBXBlendshape blendshape;
+    HFMBlendshape blendshape;
 };
 
 void printNode(const FBXNode& node, int indentLevel) {
@@ -346,8 +346,8 @@ void appendModelIDs(const QString& parentID, const QMultiMap<QString, QString>&
     }
 }
 
-FBXBlendshape extractBlendshape(const FBXNode& object) {
-    FBXBlendshape blendshape;
+HFMBlendshape extractBlendshape(const FBXNode& object) {
+    HFMBlendshape blendshape;
     foreach (const FBXNode& data, object.children) {
         if (data.name == "Indexes") {
             blendshape.indices = FBXReader::getIntVector(data);
@@ -362,9 +362,9 @@ FBXBlendshape extractBlendshape(const FBXNode& object) {
     return blendshape;
 }
 
-using IndexAccessor = std::function<glm::vec3*(const FBXMesh&, int, int, glm::vec3*, glm::vec3&)>;
+using IndexAccessor = std::function<glm::vec3*(const HFMMesh&, int, int, glm::vec3*, glm::vec3&)>;
 
-static void setTangents(const FBXMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
+static void setTangents(const HFMMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
                         const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents) {
     glm::vec3 vertex[2];
     glm::vec3 normal;
@@ -381,14 +381,14 @@ static void setTangents(const FBXMesh& mesh, const IndexAccessor& vertexAccessor
     }
 }
 
-static void createTangents(const FBXMesh& mesh, bool generateFromTexCoords,
+static void createTangents(const HFMMesh& mesh, bool generateFromTexCoords,
                            const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents,
                            IndexAccessor accessor) {
     // if we have a normal map (and texture coordinates), we must compute tangents
     if (generateFromTexCoords && !mesh.texCoords.isEmpty()) {
         tangents.resize(vertices.size());
 
-        foreach(const FBXMeshPart& part, mesh.parts) {
+        foreach(const HFMMeshPart& part, mesh.parts) {
             for (int i = 0; i < part.quadIndices.size(); i += 4) {
                 setTangents(mesh, accessor, part.quadIndices.at(i), part.quadIndices.at(i + 1), vertices, normals, tangents);
                 setTangents(mesh, accessor, part.quadIndices.at(i + 1), part.quadIndices.at(i + 2), vertices, normals, tangents);
@@ -403,27 +403,27 @@ static void createTangents(const FBXMesh& mesh, bool generateFromTexCoords,
                 setTangents(mesh, accessor, part.triangleIndices.at(i + 2), part.triangleIndices.at(i), vertices, normals, tangents);
             }
             if ((part.triangleIndices.size() % 3) != 0) {
-                qCDebug(modelformat) << "Error in extractFBXGeometry part.triangleIndices.size() is not divisible by three ";
+                qCDebug(modelformat) << "Error in extractHFMGeometry part.triangleIndices.size() is not divisible by three ";
             }
         }
     }
 }
 
-static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape);
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape);
 
-void FBXMesh::createBlendShapeTangents(bool generateTangents) {
+void HFMMesh::createBlendShapeTangents(bool generateTangents) {
     for (auto& blendShape : blendshapes) {
         _createBlendShapeTangents(*this, generateTangents, blendShape);
     }
 }
 
-void FBXMesh::createMeshTangents(bool generateFromTexCoords) {
-    FBXMesh& mesh = *this;
+void HFMMesh::createMeshTangents(bool generateFromTexCoords) {
+    HFMMesh& mesh = *this;
     // This is the only workaround I've found to trick the compiler into understanding that mesh.tangents isn't
     // const in the lambda function.
     auto& tangents = mesh.tangents;
     createTangents(mesh, generateFromTexCoords, mesh.vertices, mesh.normals, mesh.tangents, 
-                   [&](const FBXMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
         outVertices[0] = mesh.vertices[firstIndex];
         outVertices[1] = mesh.vertices[secondIndex];
         outNormal = mesh.normals[firstIndex];
@@ -431,7 +431,7 @@ void FBXMesh::createMeshTangents(bool generateFromTexCoords) {
     });
 }
 
-static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape) {
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape) {
     // Create lookup to get index in blend shape from vertex index in mesh
     std::vector<int> reverseIndices;
     reverseIndices.resize(mesh.vertices.size());
@@ -443,7 +443,7 @@ static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords,
     }
 
     createTangents(mesh, generateFromTexCoords, blendShape.vertices, blendShape.normals, blendShape.tangents,
-                   [&](const FBXMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
         const auto index1 = reverseIndices[firstIndex];
         const auto index2 = reverseIndices[secondIndex];
 
@@ -481,7 +481,7 @@ void addBlendshapes(const ExtractedBlendshape& extracted, const QList<WeightedIn
     foreach (const WeightedIndex& index, indices) {
         extractedMesh.mesh.blendshapes.resize(max(extractedMesh.mesh.blendshapes.size(), index.first + 1));
         extractedMesh.blendshapeIndexMaps.resize(extractedMesh.mesh.blendshapes.size());
-        FBXBlendshape& blendshape = extractedMesh.mesh.blendshapes[index.first];
+        HFMBlendshape& blendshape = extractedMesh.mesh.blendshapes[index.first];
         QHash<int, int>& blendshapeIndexMap = extractedMesh.blendshapeIndexMaps[index.first];
         for (int i = 0; i < extracted.blendshape.indices.size(); i++) {
             int oldIndex = extracted.blendshape.indices.at(i);
@@ -539,7 +539,7 @@ public:
     QVector<float> values;
 };
 
-bool checkMaterialsHaveTextures(const QHash<QString, FBXMaterial>& materials,
+bool checkMaterialsHaveTextures(const QHash<QString, HFMMaterial>& materials,
         const QHash<QString, QByteArray>& textureFilenames, const QMultiMap<QString, QString>& _connectionChildMap) {
     foreach (const QString& materialID, materials.keys()) {
         foreach (const QString& childID, _connectionChildMap.values(materialID)) {
@@ -569,8 +569,8 @@ int matchTextureUVSetToAttributeChannel(const QString& texUVSetName, const QHash
 }
 
 
-FBXLight extractLight(const FBXNode& object) {
-    FBXLight light;
+HFMLight extractLight(const FBXNode& object) {
+    HFMLight light;
     foreach (const FBXNode& subobject, object.children) {
         QString childname = QString(subobject.name);
         if (subobject.name == "Properties70") {
@@ -615,7 +615,7 @@ QByteArray fileOnUrl(const QByteArray& filepath, const QString& url) {
     return filepath.mid(filepath.lastIndexOf('/') + 1);
 }
 
-FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QString& url) {
+HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QString& url) {
     const FBXNode& node = _rootNode;
     QMap<QString, ExtractedMesh> meshes;
     QHash<QString, QString> modelIDsToNames;
@@ -636,7 +636,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     QHash<QString, QString> yComponents;
     QHash<QString, QString> zComponents;
 
-    std::map<QString, FBXLight> lights;
+    std::map<QString, HFMLight> lights;
 
     QVariantHash joints = mapping.value("joint").toHash();
     QString jointEyeLeftName = processID(getString(joints.value("jointEyeLeft", "jointEyeLeft")));
@@ -689,8 +689,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 #if defined(DEBUG_FBXREADER)
     int unknown = 0;
 #endif
-    FBXGeometry* geometryPtr = new FBXGeometry;
-    FBXGeometry& geometry = *geometryPtr;
+    HFMGeometry* geometryPtr = new HFMGeometry;
+    HFMGeometry& geometry = *geometryPtr;
 
     geometry.originalURL = url;
 
@@ -944,7 +944,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                                         lightprop = vprop.toString();
                                     }
 
-                                    FBXLight light = extractLight(object);
+                                    HFMLight light = extractLight(object);
                                 }
                             }
                         } else {
@@ -1102,7 +1102,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         _textureContent.insert(filepath, content);
                     }
                 } else if (object.name == "Material") {
-                    FBXMaterial material;
+                    HFMMaterial material;
                     material.name = (object.properties.at(1).toString());
                     foreach (const FBXNode& subobject, object.children) {
                         bool properties = false;
@@ -1255,7 +1255,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 #endif
                     }
                     material.materialID = getID(object.properties);
-                    _fbxMaterials.insert(material.materialID, material);
+                    _hfmMaterials.insert(material.materialID, material);
 
 
                 } else if (object.name == "NodeAttribute") {
@@ -1276,7 +1276,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
                     if (!attributetype.isEmpty()) {
                         if (attributetype == "Light") {
-                            FBXLight light = extractLight(object);
+                            HFMLight light = extractLight(object);
                             lights[attribID] = light;
                         }
                     }
@@ -1345,7 +1345,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         QString parentID = getID(connection.properties, 2);
                         ooChildToParent.insert(childID, parentID);
                         if (!hifiGlobalNodeID.isEmpty() && (parentID == hifiGlobalNodeID)) {
-                            std::map< QString, FBXLight >::iterator lightIt = lights.find(childID);
+                            std::map< QString, HFMLight >::iterator lightIt = lights.find(childID);
                             if (lightIt != lights.end()) {
                                 _lightmapLevel = (*lightIt).second.intensity;
                                 if (_lightmapLevel <= 0.0f) {
@@ -1504,7 +1504,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         frameCount = qMax(frameCount, curve.values.size());
     }
     for (int i = 0; i < frameCount; i++) {
-        FBXAnimationFrame frame;
+        HFMAnimationFrame frame;
         frame.rotations.resize(modelIDs.size());
         frame.translations.resize(modelIDs.size());
         geometry.animationFrames.append(frame);
@@ -1515,7 +1515,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     geometry.hasSkeletonJoints = false;
     foreach (const QString& modelID, modelIDs) {
         const FBXModel& model = models[modelID];
-        FBXJoint joint;
+        HFMJoint joint;
         joint.isFree = freeJoints.contains(model.name);
         joint.parentIndex = model.parentIndex;
 
@@ -1553,7 +1553,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             joint.distanceToParent = 0.0f;
 
         } else {
-            const FBXJoint& parentJoint = geometry.joints.at(joint.parentIndex);
+            const HFMJoint& parentJoint = geometry.joints.at(joint.parentIndex);
             joint.transform = parentJoint.transform * glm::translate(joint.translation) *
                 joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation) * parentJoint.inverseDefaultRotation;
@@ -1631,7 +1631,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     geometry.meshExtents.reset();
 
     // Create the Material Library
-    consolidateFBXMaterials(mapping);
+    consolidateHFMMaterials(mapping);
 
     // We can't allow the scaling of a given image to different sizes, because the hash used for the KTX cache is based on the original image
     // Allowing scaling of the same image to different sizes would cause different KTX files to target the same cache key
@@ -1643,7 +1643,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     //   33 - 128 textures --> 512
     // etc...
     QSet<QString> uniqueTextures;
-    for (auto& material : _fbxMaterials) {
+    for (auto& material : _hfmMaterials) {
         material.getTextureNames(uniqueTextures);
     }
     int numTextures = uniqueTextures.size();
@@ -1659,15 +1659,15 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         } while (numTextureThreshold < numTextures && maxWidth > MIN_MIP_TEXTURE_WIDTH);
 
         qCDebug(modelformat) << "Capped square texture width =" << maxWidth << "for model" << url << "with" << numTextures << "textures";
-        for (auto& material : _fbxMaterials) {
+        for (auto& material : _hfmMaterials) {
             material.setMaxNumPixelsPerTexture(maxWidth * maxWidth);
         }
     }
 #endif
-    geometry.materials = _fbxMaterials;
+    geometry.materials = _hfmMaterials;
 
     // see if any materials have texture children
-    bool materialsHaveTextures = checkMaterialsHaveTextures(_fbxMaterials, _textureFilenames, _connectionChildMap);
+    bool materialsHaveTextures = checkMaterialsHaveTextures(_hfmMaterials, _textureFilenames, _connectionChildMap);
 
     for (QMap<QString, ExtractedMesh>::iterator it = meshes.begin(); it != meshes.end(); it++) {
         ExtractedMesh& extracted = it.value();
@@ -1698,13 +1698,13 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         for (int i = children.size() - 1; i >= 0; i--) {
 
             const QString& childID = children.at(i);
-            if (_fbxMaterials.contains(childID)) {
+            if (_hfmMaterials.contains(childID)) {
                 // the pure material associated with this part
-                FBXMaterial material = _fbxMaterials.value(childID);
+                HFMMaterial material = _hfmMaterials.value(childID);
 
                 for (int j = 0; j < extracted.partMaterialTextures.size(); j++) {
                     if (extracted.partMaterialTextures.at(j).first == materialIndex) {
-                        FBXMeshPart& part = extracted.mesh.parts[j];
+                        HFMMeshPart& part = extracted.mesh.parts[j];
                         part.materialID = material.materialID;
                         generateTangents |= material.needTangentSpace();
                     }
@@ -1713,7 +1713,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 materialIndex++;
 
             } else if (_textureFilenames.contains(childID)) {
-                FBXTexture texture = getTexture(childID);
+                HFMTexture texture = getTexture(childID);
                 for (int j = 0; j < extracted.partMaterialTextures.size(); j++) {
                     int partTexture = extracted.partMaterialTextures.at(j).second;
                     if (partTexture == textureIndex && !(partTexture == 0 && materialsHaveTextures)) {
@@ -1736,34 +1736,34 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 if (!clusters.contains(clusterID)) {
                     continue;
                 }
-                FBXCluster fbxCluster;
+                HFMCluster hfmCluster;
                 const Cluster& cluster = clusters[clusterID];
                 clusterIDs.append(clusterID);
 
                 // see http://stackoverflow.com/questions/13566608/loading-skinning-information-from-fbx for a discussion
                 // of skinning information in FBX
                 QString jointID = _connectionChildMap.value(clusterID);
-                fbxCluster.jointIndex = modelIDs.indexOf(jointID);
-                if (fbxCluster.jointIndex == -1) {
+                hfmCluster.jointIndex = modelIDs.indexOf(jointID);
+                if (hfmCluster.jointIndex == -1) {
                     qCDebug(modelformat) << "Joint not in model list: " << jointID;
-                    fbxCluster.jointIndex = 0;
+                    hfmCluster.jointIndex = 0;
                 }
 
-                fbxCluster.inverseBindMatrix = glm::inverse(cluster.transformLink) * modelTransform;
+                hfmCluster.inverseBindMatrix = glm::inverse(cluster.transformLink) * modelTransform;
 
                 // slam bottom row to (0, 0, 0, 1), we KNOW this is not a perspective matrix and
                 // sometimes floating point fuzz can be introduced after the inverse.
-                fbxCluster.inverseBindMatrix[0][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[1][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[2][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[3][3] = 1.0f;
+                hfmCluster.inverseBindMatrix[0][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[1][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[2][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[3][3] = 1.0f;
 
-                fbxCluster.inverseBindTransform = Transform(fbxCluster.inverseBindMatrix);
+                hfmCluster.inverseBindTransform = Transform(hfmCluster.inverseBindMatrix);
 
-                extracted.mesh.clusters.append(fbxCluster);
+                extracted.mesh.clusters.append(hfmCluster);
 
                 // override the bind rotation with the transform link
-                FBXJoint& joint = geometry.joints[fbxCluster.jointIndex];
+                HFMJoint& joint = geometry.joints[hfmCluster.jointIndex];
                 joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
                 joint.bindTransform = cluster.transformLink;
                 joint.bindTransformFoundInCluster = true;
@@ -1776,7 +1776,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
         // if we don't have a skinned joint, parent to the model itself
         if (extracted.mesh.clusters.isEmpty()) {
-            FBXCluster cluster;
+            HFMCluster cluster;
             cluster.jointIndex = modelIDs.indexOf(modelID);
             if (cluster.jointIndex == -1) {
                 qCDebug(modelformat) << "Model not in model list: " << modelID;
@@ -1786,7 +1786,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         }
 
         // whether we're skinned depends on how many clusters are attached
-        const FBXCluster& firstFBXCluster = extracted.mesh.clusters.at(0);
+        const HFMCluster& firstHFMCluster = extracted.mesh.clusters.at(0);
         glm::mat4 inverseModelTransform = glm::inverse(modelTransform);
         if (clusterIDs.size() > 1) {
             // this is a multi-mesh joint
@@ -1799,9 +1799,9 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             for (int i = 0; i < clusterIDs.size(); i++) {
                 QString clusterID = clusterIDs.at(i);
                 const Cluster& cluster = clusters[clusterID];
-                const FBXCluster& fbxCluster = extracted.mesh.clusters.at(i);
-                int jointIndex = fbxCluster.jointIndex;
-                FBXJoint& joint = geometry.joints[jointIndex];
+                const HFMCluster& hfmCluster = extracted.mesh.clusters.at(i);
+                int jointIndex = hfmCluster.jointIndex;
+                HFMJoint& joint = geometry.joints[jointIndex];
                 glm::mat4 transformJointToMesh = inverseModelTransform * joint.bindTransform;
                 glm::vec3 boneEnd = extractTranslation(transformJointToMesh);
                 glm::vec3 boneBegin = boneEnd;
@@ -1881,8 +1881,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             }
         } else {
             // this is a single-mesh joint
-            int jointIndex = firstFBXCluster.jointIndex;
-            FBXJoint& joint = geometry.joints[jointIndex];
+            int jointIndex = firstHFMCluster.jointIndex;
+            HFMJoint& joint = geometry.joints[jointIndex];
 
             // transform cluster vertices to joint-frame and save for later
             glm::mat4 meshToJoint = glm::inverse(joint.bindTransform) * modelTransform;
@@ -1924,7 +1924,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
     // now that all joints have been scanned compute a k-Dop bounding volume of mesh
     for (int i = 0; i < geometry.joints.size(); ++i) {
-        FBXJoint& joint = geometry.joints[i];
+        HFMJoint& joint = geometry.joints[i];
 
         // NOTE: points are in joint-frame
         ShapeVertices& points = shapeVertices.at(i);
@@ -1994,13 +1994,13 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     return geometryPtr;
 }
 
-FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     QBuffer buffer(const_cast<QByteArray*>(&model));
     buffer.open(QIODevice::ReadOnly);
     return readFBX(&buffer, mapping, url, loadLightmaps, lightmapLevel);
 }
 
-FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     FBXReader reader;
     reader._rootNode = FBXReader::parseFBX(device);
     reader._loadLightmaps = loadLightmaps;
@@ -2008,5 +2008,5 @@ FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QStri
 
     qCDebug(modelformat) << "Reading FBX: " << url;
 
-    return reader.extractFBXGeometry(mapping, url);
+    return reader.extractHFMGeometry(mapping, url);
 }
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index c391ea6647..f95ba7fe73 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -36,11 +36,11 @@ class FBXNode;
 
 /// Reads FBX geometry from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
 /// Reads FBX geometry from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
 class TextureParam {
 public:
@@ -103,20 +103,20 @@ class ExtractedMesh;
 
 class FBXReader {
 public:
-    FBXGeometry* _fbxGeometry;
+    HFMGeometry* _hfmGeometry;
 
     FBXNode _rootNode;
     static FBXNode parseFBX(QIODevice* device);
 
-    FBXGeometry* extractFBXGeometry(const QVariantHash& mapping, const QString& url);
+    HFMGeometry* extractHFMGeometry(const QVariantHash& mapping, const QString& url);
 
     static ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex, bool deduplicate = true);
     QHash<QString, ExtractedMesh> meshes;
-    static void buildModelMesh(FBXMesh& extractedMesh, const QString& url);
+    static void buildModelMesh(HFMMesh& extractedMesh, const QString& url);
 
     static glm::vec3 normalizeDirForPacking(const glm::vec3& dir);
 
-    FBXTexture getTexture(const QString& textureID);
+    HFMTexture getTexture(const QString& textureID);
 
     QHash<QString, QString> _textureNames;
     // Hashes the original RelativeFilename of textures
@@ -142,9 +142,9 @@ public:
     QHash<QString, QString> ambientFactorTextures;
     QHash<QString, QString> occlusionTextures;
 
-    QHash<QString, FBXMaterial> _fbxMaterials;
+    QHash<QString, HFMMaterial> _hfmMaterials;
 
-    void consolidateFBXMaterials(const QVariantHash& mapping);
+    void consolidateHFMMaterials(const QVariantHash& mapping);
 
     bool _loadLightmaps = true;
     float _lightmapOffset = 0.0f;
diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp
index d5902962e5..ff1de30b97 100644
--- a/libraries/fbx/src/FBXReader_Material.cpp
+++ b/libraries/fbx/src/FBXReader_Material.cpp
@@ -27,7 +27,7 @@
 
 #include "ModelFormatLogging.h"
 
-void FBXMaterial::getTextureNames(QSet<QString>& textureList) const {
+void HFMMaterial::getTextureNames(QSet<QString>& textureList) const {
     if (!normalTexture.isNull()) {
         textureList.insert(normalTexture.name);
     }
@@ -63,7 +63,7 @@ void FBXMaterial::getTextureNames(QSet<QString>& textureList) const {
     }
 }
 
-void FBXMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
+void HFMMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
     normalTexture.maxNumPixels = maxNumPixels;
     albedoTexture.maxNumPixels = maxNumPixels;
     opacityTexture.maxNumPixels = maxNumPixels;
@@ -77,12 +77,12 @@ void FBXMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
     lightmapTexture.maxNumPixels = maxNumPixels;
 }
 
-bool FBXMaterial::needTangentSpace() const {
+bool HFMMaterial::needTangentSpace() const {
     return !normalTexture.isNull();
 }
 
-FBXTexture FBXReader::getTexture(const QString& textureID) {
-    FBXTexture texture;
+HFMTexture FBXReader::getTexture(const QString& textureID) {
+    HFMTexture texture;
     const QByteArray& filepath = _textureFilepaths.value(textureID);
     texture.content = _textureContent.value(filepath);
 
@@ -123,7 +123,7 @@ FBXTexture FBXReader::getTexture(const QString& textureID) {
     return texture;
 }
 
-void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
+void FBXReader::consolidateHFMMaterials(const QVariantHash& mapping) {
 
     QString materialMapString = mapping.value("materialMap").toString();
     QJsonDocument materialMapDocument = QJsonDocument::fromJson(materialMapString.toUtf8());
@@ -133,16 +133,16 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             qCDebug(modelformat) << "fbx Material Map found but did not produce valid JSON:" << materialMapString;
         }
     }
-    for (QHash<QString, FBXMaterial>::iterator it = _fbxMaterials.begin(); it != _fbxMaterials.end(); it++) {
-        FBXMaterial& material = (*it);
+    for (QHash<QString, HFMMaterial>::iterator it = _hfmMaterials.begin(); it != _hfmMaterials.end(); it++) {
+        HFMMaterial& material = (*it);
 
         // Maya is the exporting the shading model and we are trying to use it
         bool isMaterialLambert = (material.shadingModel.toLower() == "lambert");
 
         // the pure material associated with this part
         bool detectDifferentUVs = false;
-        FBXTexture diffuseTexture;
-        FBXTexture diffuseFactorTexture;
+        HFMTexture diffuseTexture;
+        HFMTexture diffuseFactorTexture;
         QString diffuseTextureID = diffuseTextures.value(material.materialID);
         QString diffuseFactorTextureID = diffuseFactorTextures.value(material.materialID);
 
@@ -169,7 +169,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs = (diffuseTexture.texcoordSet != 0) || (!diffuseTexture.transform.isIdentity());
         }
 
-        FBXTexture transparentTexture;
+        HFMTexture transparentTexture;
         QString transparentTextureID = transparentTextures.value(material.materialID);
         // If PBS Material, systematically bind the albedo texture as transparency texture and check for the alpha channel
         if (material.isPBSMaterial) {
@@ -181,7 +181,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (transparentTexture.texcoordSet != 0) || (!transparentTexture.transform.isIdentity());
         }
 
-        FBXTexture normalTexture;
+        HFMTexture normalTexture;
         QString bumpTextureID = bumpTextures.value(material.materialID);
         QString normalTextureID = normalTextures.value(material.materialID);
         if (!normalTextureID.isNull()) {
@@ -198,7 +198,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (normalTexture.texcoordSet != 0) || (!normalTexture.transform.isIdentity());
         }
 
-        FBXTexture specularTexture;
+        HFMTexture specularTexture;
         QString specularTextureID = specularTextures.value(material.materialID);
         if (!specularTextureID.isNull()) {
             specularTexture = getTexture(specularTextureID);
@@ -206,7 +206,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             material.specularTexture = specularTexture;
         }
 
-        FBXTexture metallicTexture;
+        HFMTexture metallicTexture;
         QString metallicTextureID = metallicTextures.value(material.materialID);
         if (!metallicTextureID.isNull()) {
             metallicTexture = getTexture(metallicTextureID);
@@ -214,7 +214,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             material.metallicTexture = metallicTexture;
         }
 
-        FBXTexture roughnessTexture;
+        HFMTexture roughnessTexture;
         QString roughnessTextureID = roughnessTextures.value(material.materialID);
         if (!roughnessTextureID.isNull()) {
             roughnessTexture = getTexture(roughnessTextureID);
@@ -222,7 +222,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (roughnessTexture.texcoordSet != 0) || (!roughnessTexture.transform.isIdentity());
         }
 
-        FBXTexture shininessTexture;
+        HFMTexture shininessTexture;
         QString shininessTextureID = shininessTextures.value(material.materialID);
         if (!shininessTextureID.isNull()) {
             shininessTexture = getTexture(shininessTextureID);
@@ -230,7 +230,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (shininessTexture.texcoordSet != 0) || (!shininessTexture.transform.isIdentity());
         }
 
-        FBXTexture emissiveTexture;
+        HFMTexture emissiveTexture;
         QString emissiveTextureID = emissiveTextures.value(material.materialID);
         if (!emissiveTextureID.isNull()) {
             emissiveTexture = getTexture(emissiveTextureID);
@@ -245,7 +245,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             }
         }
 
-        FBXTexture occlusionTexture;
+        HFMTexture occlusionTexture;
         QString occlusionTextureID = occlusionTextures.value(material.materialID);
         if (occlusionTextureID.isNull()) {
             // 2nd chance
@@ -265,7 +265,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
         lightmapParams.x = _lightmapOffset;
         lightmapParams.y = _lightmapLevel;
 
-        FBXTexture ambientTexture;
+        HFMTexture ambientTexture;
         QString ambientTextureID = ambientTextures.value(material.materialID);
         if (ambientTextureID.isNull()) {
             // 2nd chance
@@ -326,7 +326,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
 
             if (materialOptions.contains("scatteringMap")) {
                 QByteArray scatteringMap = materialOptions.value("scatteringMap").toVariant().toByteArray();
-                material.scatteringTexture = FBXTexture();
+                material.scatteringTexture = HFMTexture();
                 material.scatteringTexture.name = material.name + ".scatteringMap";
                 material.scatteringTexture.filename = scatteringMap;
             }
diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index c9b004c3a8..e098aff99a 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -42,9 +42,9 @@
 
 using vec2h = glm::tvec2<glm::detail::hdata>;
 
-#define FBX_PACK_COLORS 1
+#define HFM_PACK_COLORS 1
 
-#if FBX_PACK_COLORS
+#if HFM_PACK_COLORS
 using ColorType = glm::uint32;
 #define FBX_COLOR_ELEMENT gpu::Element::COLOR_RGBA_32
 #else
@@ -469,7 +469,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
 
                 QPair<int, int> materialTexture(materialID, 0);
 
-                // grab or setup the FBXMeshPart for the part this face belongs to
+                // grab or setup the HFMMeshPart for the part this face belongs to
                 int& partIndexPlusOne = materialTextureParts[materialTexture];
                 if (partIndexPlusOne == 0) {
                     data.extracted.partMaterialTextures.append(materialTexture);
@@ -478,7 +478,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                 }
 
                 // give the mesh part this index
-                FBXMeshPart& part = data.extracted.mesh.parts[partIndexPlusOne - 1];
+                HFMMeshPart& part = data.extracted.mesh.parts[partIndexPlusOne - 1];
                 part.triangleIndices.append(firstCorner.value());
                 part.triangleIndices.append(dracoFace[1].value());
                 part.triangleIndices.append(dracoFace[2].value());
@@ -511,7 +511,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                 data.extracted.mesh.parts.resize(data.extracted.mesh.parts.size() + 1);
                 partIndex = data.extracted.mesh.parts.size();
             }
-            FBXMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
+            HFMMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
 
             if (endIndex - beginIndex == 4) {
                 appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
@@ -565,9 +565,9 @@ glm::vec3 FBXReader::normalizeDirForPacking(const glm::vec3& dir) {
     return dir;
 }
 
-void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
+void FBXReader::buildModelMesh(HFMMesh& extractedMesh, const QString& url) {
     unsigned int totalSourceIndices = 0;
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         totalSourceIndices += (part.quadTrianglesIndices.size() + part.triangleIndices.size());
     }
 
@@ -583,17 +583,17 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
         return;
     }
 
-    FBXMesh& fbxMesh = extractedMesh;
+    HFMMesh& hfmMesh = extractedMesh;
     graphics::MeshPointer mesh(new graphics::Mesh());
     int numVerts = extractedMesh.vertices.size();
 
-    if (!fbxMesh.normals.empty() && fbxMesh.tangents.empty()) {
+    if (!hfmMesh.normals.empty() && hfmMesh.tangents.empty()) {
         // Fill with a dummy value to force tangents to be present if there are normals
-        fbxMesh.tangents.reserve(fbxMesh.normals.size());
-        std::fill_n(std::back_inserter(fbxMesh.tangents), fbxMesh.normals.size(), Vectors::UNIT_X);
+        hfmMesh.tangents.reserve(hfmMesh.normals.size());
+        std::fill_n(std::back_inserter(hfmMesh.tangents), hfmMesh.normals.size(), Vectors::UNIT_X);
     }
     // Same thing with blend shapes
-    for (auto& blendShape : fbxMesh.blendshapes) {
+    for (auto& blendShape : hfmMesh.blendshapes) {
         if (!blendShape.normals.empty() && blendShape.tangents.empty()) {
             // Fill with a dummy value to force tangents to be present if there are normals
             blendShape.tangents.reserve(blendShape.normals.size());
@@ -609,8 +609,8 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Normal and tangent are always there together packed in normalized xyz32bits word (times 2)
     const auto normalElement = FBX_NORMAL_ELEMENT;
-    const int normalsSize = fbxMesh.normals.size() * normalElement.getSize();
-    const int tangentsSize = fbxMesh.tangents.size() * normalElement.getSize();
+    const int normalsSize = hfmMesh.normals.size() * normalElement.getSize();
+    const int tangentsSize = hfmMesh.tangents.size() * normalElement.getSize();
     // If there are normals then there should be tangents
     assert(normalsSize <= tangentsSize);
     if (tangentsSize > normalsSize) {
@@ -620,22 +620,22 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Color attrib
     const auto colorElement = FBX_COLOR_ELEMENT;
-    const int colorsSize = fbxMesh.colors.size() * colorElement.getSize();
+    const int colorsSize = hfmMesh.colors.size() * colorElement.getSize();
    
     // Texture coordinates are stored in 2 half floats
     const auto texCoordsElement = gpu::Element(gpu::VEC2, gpu::HALF, gpu::UV);
-    const int texCoordsSize = fbxMesh.texCoords.size() * texCoordsElement.getSize();
-    const int texCoords1Size = fbxMesh.texCoords1.size() * texCoordsElement.getSize();
+    const int texCoordsSize = hfmMesh.texCoords.size() * texCoordsElement.getSize();
+    const int texCoords1Size = hfmMesh.texCoords1.size() * texCoordsElement.getSize();
 
     // Support for 4 skinning clusters:
     // 4 Indices are uint8 ideally, uint16 if more than 256.
-    const auto clusterIndiceElement = (fbxMesh.clusters.size() < UINT8_MAX ? gpu::Element(gpu::VEC4, gpu::UINT8, gpu::XYZW) : gpu::Element(gpu::VEC4, gpu::UINT16, gpu::XYZW));
+    const auto clusterIndiceElement = (hfmMesh.clusters.size() < UINT8_MAX ? gpu::Element(gpu::VEC4, gpu::UINT8, gpu::XYZW) : gpu::Element(gpu::VEC4, gpu::UINT16, gpu::XYZW));
     // 4 Weights are normalized 16bits
     const auto clusterWeightElement = gpu::Element(gpu::VEC4, gpu::NUINT16, gpu::XYZW);
 
     // Cluster indices and weights must be the same sizes
     const int NUM_CLUSTERS_PER_VERT = 4;
-    const int numVertClusters = (fbxMesh.clusterIndices.size() == fbxMesh.clusterWeights.size() ? fbxMesh.clusterIndices.size() / NUM_CLUSTERS_PER_VERT : 0);
+    const int numVertClusters = (hfmMesh.clusterIndices.size() == hfmMesh.clusterWeights.size() ? hfmMesh.clusterIndices.size() / NUM_CLUSTERS_PER_VERT : 0);
     const int clusterIndicesSize = numVertClusters * clusterIndiceElement.getSize();
     const int clusterWeightsSize = numVertClusters * clusterWeightElement.getSize();
 
@@ -660,9 +660,9 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     if (normalsSize > 0) {
         std::vector<NormalType> normalsAndTangents;
 
-        normalsAndTangents.reserve(fbxMesh.normals.size() + fbxMesh.tangents.size());
-        for (auto normalIt = fbxMesh.normals.constBegin(), tangentIt = fbxMesh.tangents.constBegin();
-            normalIt != fbxMesh.normals.constEnd();
+        normalsAndTangents.reserve(hfmMesh.normals.size() + hfmMesh.tangents.size());
+        for (auto normalIt = hfmMesh.normals.constBegin(), tangentIt = hfmMesh.tangents.constBegin();
+            normalIt != hfmMesh.normals.constEnd();
             ++normalIt, ++tangentIt) {
 #if FBX_PACK_NORMALS
             const auto normal = normalizeDirForPacking(*normalIt);
@@ -681,24 +681,24 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Pack colors
     if (colorsSize > 0) {
-#if FBX_PACK_COLORS
+#if HFM_PACK_COLORS
         std::vector<ColorType> colors;
 
-        colors.reserve(fbxMesh.colors.size());
-        for (const auto& color : fbxMesh.colors) {
+        colors.reserve(hfmMesh.colors.size());
+        for (const auto& color : hfmMesh.colors) {
             colors.push_back(glm::packUnorm4x8(glm::vec4(color, 1.0f)));
         }
         vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) colors.data());
 #else
-        vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) fbxMesh.colors.constData());
+        vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) hfmMesh.colors.constData());
 #endif
     }
 
     // Pack Texcoords 0 and 1 (if exists)
     if (texCoordsSize > 0) {
         QVector<vec2h> texCoordData;
-        texCoordData.reserve(fbxMesh.texCoords.size());
-        for (auto& texCoordVec2f : fbxMesh.texCoords) {
+        texCoordData.reserve(hfmMesh.texCoords.size());
+        for (auto& texCoordVec2f : hfmMesh.texCoords) {
             vec2h texCoordVec2h;
 
             texCoordVec2h.x = glm::detail::toFloat16(texCoordVec2f.x);
@@ -709,8 +709,8 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     }
     if (texCoords1Size > 0) {
         QVector<vec2h> texCoordData;
-        texCoordData.reserve(fbxMesh.texCoords1.size());
-        for (auto& texCoordVec2f : fbxMesh.texCoords1) {
+        texCoordData.reserve(hfmMesh.texCoords1.size());
+        for (auto& texCoordVec2f : hfmMesh.texCoords1) {
             vec2h texCoordVec2h;
 
             texCoordVec2h.x = glm::detail::toFloat16(texCoordVec2f.x);
@@ -722,22 +722,22 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Clusters data
     if (clusterIndicesSize > 0) {
-        if (fbxMesh.clusters.size() < UINT8_MAX) {
+        if (hfmMesh.clusters.size() < UINT8_MAX) {
             // yay! we can fit the clusterIndices within 8-bits
-            int32_t numIndices = fbxMesh.clusterIndices.size();
+            int32_t numIndices = hfmMesh.clusterIndices.size();
             QVector<uint8_t> clusterIndices;
             clusterIndices.resize(numIndices);
             for (int32_t i = 0; i < numIndices; ++i) {
-                assert(fbxMesh.clusterIndices[i] <= UINT8_MAX);
-                clusterIndices[i] = (uint8_t)(fbxMesh.clusterIndices[i]);
+                assert(hfmMesh.clusterIndices[i] <= UINT8_MAX);
+                clusterIndices[i] = (uint8_t)(hfmMesh.clusterIndices[i]);
             }
             vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) clusterIndices.constData());
         } else {
-            vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) fbxMesh.clusterIndices.constData());
+            vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) hfmMesh.clusterIndices.constData());
         }
     }
     if (clusterWeightsSize > 0) {
-        vertBuffer->setSubData(clusterWeightsOffset, clusterWeightsSize, (const gpu::Byte*) fbxMesh.clusterWeights.constData());
+        vertBuffer->setSubData(clusterWeightsOffset, clusterWeightsSize, (const gpu::Byte*) hfmMesh.clusterWeights.constData());
     }
 
 
@@ -856,7 +856,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Index and Part Buffers
     unsigned int totalIndices = 0;
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         totalIndices += (part.quadTrianglesIndices.size() + part.triangleIndices.size());
     }
 
@@ -875,7 +875,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     if (extractedMesh.parts.size() > 1) {
         indexNum = 0;
     }
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         graphics::Mesh::Part modelPart(indexNum, 0, 0, graphics::Mesh::TRIANGLES);
         
         if (part.quadTrianglesIndices.size()) {
diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp
index b93dc3541b..05534b5264 100644
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@@ -697,7 +697,7 @@ glm::mat4 GLTFReader::getModelTransform(const GLTFNode& node) {
     return tmat;
 }
 
-bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
+bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
 
     //Build dependencies
     QVector<QVector<int>> nodeDependencies(_file.nodes.size());
@@ -750,10 +750,10 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
 
     for (int i = 0; i < materialIDs.size(); i++) {
         QString& matid = materialIDs[i];
-        geometry.materials[matid] = FBXMaterial();
-        FBXMaterial& fbxMaterial = geometry.materials[matid];
-        fbxMaterial._material = std::make_shared<graphics::Material>();
-        setFBXMaterial(fbxMaterial, _file.materials[i]);
+        geometry.materials[matid] = HFMMaterial();
+        HFMMaterial& hfmMaterial = geometry.materials[matid];
+        hfmMaterial._material = std::make_shared<graphics::Material>();
+        setHFMMaterial(hfmMaterial, _file.materials[i]);
     }
 
     
@@ -765,9 +765,9 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
         if (node.defined["mesh"]) {
             qCDebug(modelformat) << "node_transforms" << node.transforms;
             foreach(auto &primitive, _file.meshes[node.mesh].primitives) {
-                geometry.meshes.append(FBXMesh());
-                FBXMesh& mesh = geometry.meshes[geometry.meshes.size() - 1];
-                FBXCluster cluster;
+                geometry.meshes.append(HFMMesh());
+                HFMMesh& mesh = geometry.meshes[geometry.meshes.size() - 1];
+                HFMCluster cluster;
                 cluster.jointIndex = 0;
                 cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
                     0, 1, 0, 0,
@@ -775,7 +775,7 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
                     0, 0, 0, 1);
                 mesh.clusters.append(cluster);
 
-                FBXMeshPart part = FBXMeshPart();
+                HFMMeshPart part = HFMMeshPart();
 
                 int indicesAccessorIdx = primitive.indices;
 
@@ -910,7 +910,7 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
     return true;
 }
 
-FBXGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping, 
+HFMGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping, 
                                   const QUrl& url, bool loadLightmaps, float lightmapLevel) {
     
     _url = url;
@@ -924,8 +924,8 @@ FBXGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping
 
     parseGLTF(model);
     //_file.dump();
-    FBXGeometry* geometryPtr = new FBXGeometry();
-    FBXGeometry& geometry = *geometryPtr;
+    HFMGeometry* geometryPtr = new HFMGeometry();
+    HFMGeometry& geometry = *geometryPtr;
 
     buildGeometry(geometry, url);
     
@@ -997,8 +997,8 @@ QNetworkReply* GLTFReader::request(QUrl& url, bool isTest) {
     return netReply;                // trying to sync later on.
 }
 
-FBXTexture GLTFReader::getFBXTexture(const GLTFTexture& texture) {
-    FBXTexture fbxtex = FBXTexture();
+HFMTexture GLTFReader::getHFMTexture(const GLTFTexture& texture) {
+    HFMTexture fbxtex = HFMTexture();
     fbxtex.texcoordSet = 0;
     
     if (texture.defined["source"]) {
@@ -1014,7 +1014,7 @@ FBXTexture GLTFReader::getFBXTexture(const GLTFTexture& texture) {
     return fbxtex;
 }
 
-void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material) {
+void GLTFReader::setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material) {
 
 
     if (material.defined["name"]) {
@@ -1029,17 +1029,17 @@ void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& materia
     }
 
     if (material.defined["emissiveTexture"]) {
-        fbxmat.emissiveTexture = getFBXTexture(_file.textures[material.emissiveTexture]);
+        fbxmat.emissiveTexture = getHFMTexture(_file.textures[material.emissiveTexture]);
         fbxmat.useEmissiveMap = true;
     }
     
     if (material.defined["normalTexture"]) {
-        fbxmat.normalTexture = getFBXTexture(_file.textures[material.normalTexture]);
+        fbxmat.normalTexture = getHFMTexture(_file.textures[material.normalTexture]);
         fbxmat.useNormalMap = true;
     }
     
     if (material.defined["occlusionTexture"]) {
-        fbxmat.occlusionTexture = getFBXTexture(_file.textures[material.occlusionTexture]);
+        fbxmat.occlusionTexture = getHFMTexture(_file.textures[material.occlusionTexture]);
         fbxmat.useOcclusionMap = true;
     }
 
@@ -1050,14 +1050,14 @@ void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& materia
             fbxmat.metallic = material.pbrMetallicRoughness.metallicFactor;
         }
         if (material.pbrMetallicRoughness.defined["baseColorTexture"]) {
-            fbxmat.opacityTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
-            fbxmat.albedoTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
+            fbxmat.opacityTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
+            fbxmat.albedoTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
             fbxmat.useAlbedoMap = true;
         }
         if (material.pbrMetallicRoughness.defined["metallicRoughnessTexture"]) {
-            fbxmat.roughnessTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
+            fbxmat.roughnessTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
             fbxmat.useRoughnessMap = true;
-            fbxmat.metallicTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
+            fbxmat.metallicTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
             fbxmat.useMetallicMap = true;
         }
         if (material.pbrMetallicRoughness.defined["roughnessFactor"]) {
@@ -1181,8 +1181,8 @@ void GLTFReader::retriangulate(const QVector<int>& inIndices, const QVector<glm:
     }
 }
 
-void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
-    qCDebug(modelformat) << "---------------- fbxGeometry ----------------";
+void GLTFReader::fbxDebugDump(const HFMGeometry& fbxgeo) {
+    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
     qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
     qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
 
@@ -1211,7 +1211,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
     qCDebug(modelformat) << "---------------- Meshes ----------------";
     qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
     qCDebug(modelformat) << "  blendshapeChannelNames = " << fbxgeo.blendshapeChannelNames;
-    foreach(FBXMesh mesh, fbxgeo.meshes) {
+    foreach(HFMMesh mesh, fbxgeo.meshes) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    meshpointer =" << mesh._mesh.get();
         qCDebug(modelformat) << "    meshindex =" << mesh.meshIndex;
@@ -1227,7 +1227,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "    modelTransform =" << mesh.modelTransform;
         qCDebug(modelformat) << "    parts.count() =" << mesh.parts.count();
         qCDebug(modelformat) << "---------------- Meshes (blendshapes)--------";
-        foreach(FBXBlendshape bshape, mesh.blendshapes) {
+        foreach(HFMBlendshape bshape, mesh.blendshapes) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "    bshape.indices.count() =" << bshape.indices.count();
             qCDebug(modelformat) << "    bshape.vertices.count() =" << bshape.vertices.count();
@@ -1235,7 +1235,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
             qCDebug(modelformat) << "\n";
         }
         qCDebug(modelformat) << "---------------- Meshes (meshparts)--------";
-        foreach(FBXMeshPart meshPart, mesh.parts) {
+        foreach(HFMMeshPart meshPart, mesh.parts) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "        quadIndices.count() =" << meshPart.quadIndices.count();
             qCDebug(modelformat) << "        triangleIndices.count() =" << meshPart.triangleIndices.count();
@@ -1245,7 +1245,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         }
         qCDebug(modelformat) << "---------------- Meshes (clusters)--------";
         qCDebug(modelformat) << "    clusters.count() =" << mesh.clusters.count();
-        foreach(FBXCluster cluster, mesh.clusters) {
+        foreach(HFMCluster cluster, mesh.clusters) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "        jointIndex =" << cluster.jointIndex;
             qCDebug(modelformat) << "        inverseBindMatrix =" << cluster.inverseBindMatrix;
@@ -1254,7 +1254,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "\n";
     }
     qCDebug(modelformat) << "---------------- AnimationFrames ----------------";
-    foreach(FBXAnimationFrame anim, fbxgeo.animationFrames) {
+    foreach(HFMAnimationFrame anim, fbxgeo.animationFrames) {
         qCDebug(modelformat) << "  anim.translations = " << anim.translations;
         qCDebug(modelformat) << "  anim.rotations = " << anim.rotations;
     }
@@ -1265,7 +1265,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
 
     qCDebug(modelformat) << "---------------- Materials ----------------";
 
-    foreach(FBXMaterial mat, fbxgeo.materials) {
+    foreach(HFMMaterial mat, fbxgeo.materials) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "  mat.materialID =" << mat.materialID;
         qCDebug(modelformat) << "  diffuseColor =" << mat.diffuseColor;
@@ -1314,7 +1314,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
 
     qCDebug(modelformat) << "---------------- Joints ----------------";
 
-    foreach(FBXJoint joint, fbxgeo.joints) {
+    foreach(HFMJoint joint, fbxgeo.joints) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    shapeInfo.avgPoint =" << joint.shapeInfo.avgPoint;
         qCDebug(modelformat) << "    shapeInfo.debugLines =" << joint.shapeInfo.debugLines;
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index 2183256b87..b75962aa55 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -706,7 +706,7 @@ class GLTFReader : public QObject {
     Q_OBJECT
 public:
     GLTFReader();
-    FBXGeometry* readGLTF(QByteArray& model, const QVariantHash& mapping, 
+    HFMGeometry* readGLTF(QByteArray& model, const QVariantHash& mapping, 
                           const QUrl& url, bool loadLightmaps = true, float lightmapLevel = 1.0f);
 private:
     GLTFFile _file;
@@ -714,7 +714,7 @@ private:
 
     glm::mat4 getModelTransform(const GLTFNode& node);
 
-    bool buildGeometry(FBXGeometry& geometry, const QUrl& url);
+    bool buildGeometry(HFMGeometry& geometry, const QUrl& url);
     bool parseGLTF(const QByteArray& model);
     
     bool getStringVal(const QJsonObject& object, const QString& fieldname, 
@@ -778,9 +778,9 @@ private:
     bool doesResourceExist(const QString& url);
 
 
-    void setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material);
-    FBXTexture getFBXTexture(const GLTFTexture& texture);
-    void fbxDebugDump(const FBXGeometry& fbxgeo);
+    void setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material);
+    HFMTexture getHFMTexture(const GLTFTexture& texture);
+    void fbxDebugDump(const HFMGeometry& fbxgeo);
 };
 
 #endif // hifi_GLTFReader_h
\ No newline at end of file
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 7a2cbff497..ec48663307 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -175,7 +175,7 @@ glm::vec2 OBJTokenizer::getVec2() {
 }
 
 
-void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID) {
+void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID) {
     meshPart.materialID = materialID;
 }
 
@@ -488,12 +488,12 @@ QNetworkReply* request(QUrl& url, bool isTest) {
 }
 
 
-bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
+bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
                               float& scaleGuess, bool combineParts) {
     FaceGroup faces;
-    FBXMesh& mesh = geometry.meshes[0];
-    mesh.parts.append(FBXMeshPart());
-    FBXMeshPart& meshPart = mesh.parts.last();
+    HFMMesh& mesh = geometry.meshes[0];
+    mesh.parts.append(HFMMeshPart());
+    HFMMeshPart& meshPart = mesh.parts.last();
     bool sawG = false;
     bool result = true;
     int originalFaceCountForDebugging = 0;
@@ -652,13 +652,13 @@ done:
 }
 
 
-FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
+HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
     PROFILE_RANGE_EX(resource_parse, __FUNCTION__, 0xffff0000, nullptr);
     QBuffer buffer { &model };
     buffer.open(QIODevice::ReadOnly);
 
-    auto geometryPtr { std::make_shared<FBXGeometry>() };
-    FBXGeometry& geometry { *geometryPtr };
+    auto geometryPtr { std::make_shared<HFMGeometry>() };
+    HFMGeometry& geometry { *geometryPtr };
     OBJTokenizer tokenizer { &buffer };
     float scaleGuess = 1.0f;
 
@@ -666,14 +666,14 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
 
     _url = url;
     geometry.meshExtents.reset();
-    geometry.meshes.append(FBXMesh());
+    geometry.meshes.append(HFMMesh());
 
     try {
         // call parseOBJGroup as long as it's returning true.  Each successful call will
         // add a new meshPart to the geometry's single mesh.
         while (parseOBJGroup(tokenizer, mapping, geometry, scaleGuess, combineParts)) {}
 
-        FBXMesh& mesh = geometry.meshes[0];
+        HFMMesh& mesh = geometry.meshes[0];
         mesh.meshIndex = 0;
 
         geometry.joints.resize(1);
@@ -688,7 +688,7 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
 
         geometry.jointIndices["x"] = 1;
 
-        FBXCluster cluster;
+        HFMCluster cluster;
         cluster.jointIndex = 0;
         cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
             0, 1, 0, 0,
@@ -697,20 +697,20 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         mesh.clusters.append(cluster);
 
         QMap<QString, int> materialMeshIdMap;
-        QVector<FBXMeshPart> fbxMeshParts;
+        QVector<HFMMeshPart> hfmMeshParts;
         for (int i = 0, meshPartCount = 0; i < mesh.parts.count(); i++, meshPartCount++) {
-            FBXMeshPart& meshPart = mesh.parts[i];
+            HFMMeshPart& meshPart = mesh.parts[i];
             FaceGroup faceGroup = faceGroups[meshPartCount];
             bool specifiesUV = false;
             foreach(OBJFace face, faceGroup) {
                 // Go through all of the OBJ faces and determine the number of different materials necessary (each different material will be a unique mesh).
                 // NOTE (trent/mittens 3/30/17): this seems hardcore wasteful and is slowed down a bit by iterating through the face group twice, but it's the best way I've thought of to hack multi-material support in an OBJ into this pipeline.
                 if (!materialMeshIdMap.contains(face.materialName)) {
-                    // Create a new FBXMesh for this material mapping.
+                    // Create a new HFMMesh for this material mapping.
                     materialMeshIdMap.insert(face.materialName, materialMeshIdMap.count());
 
-                    fbxMeshParts.append(FBXMeshPart());
-                    FBXMeshPart& meshPartNew = fbxMeshParts.last();
+                    hfmMeshParts.append(HFMMeshPart());
+                    HFMMeshPart& meshPartNew = hfmMeshParts.last();
                     meshPartNew.quadIndices = QVector<int>(meshPart.quadIndices);                    // Copy over quad indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
                     meshPartNew.quadTrianglesIndices = QVector<int>(meshPart.quadTrianglesIndices); // Copy over quad triangulated indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
                     meshPartNew.triangleIndices = QVector<int>(meshPart.triangleIndices);            // Copy over triangle indices.
@@ -745,14 +745,14 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         // clean up old mesh parts.
         int unmodifiedMeshPartCount = mesh.parts.count();
         mesh.parts.clear();
-        mesh.parts = QVector<FBXMeshPart>(fbxMeshParts);
+        mesh.parts = QVector<HFMMeshPart>(hfmMeshParts);
 
         for (int i = 0, meshPartCount = 0; i < unmodifiedMeshPartCount; i++, meshPartCount++) {
             FaceGroup faceGroup = faceGroups[meshPartCount];
 
             // Now that each mesh has been created with its own unique material mappings, fill them with data (vertex data is duplicated, face data is not).
             foreach(OBJFace face, faceGroup) {
-                FBXMeshPart& meshPart = mesh.parts[materialMeshIdMap[face.materialName]];
+                HFMMeshPart& meshPart = mesh.parts[materialMeshIdMap[face.materialName]];
 
                 glm::vec3 v0 = checked_at(vertices, face.vertexIndices[0]);
                 glm::vec3 v1 = checked_at(vertices, face.vertexIndices[1]);
@@ -885,38 +885,38 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         if (!objMaterial.used) {
             continue;
         }
-        geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor,
+        geometry.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
                                                      objMaterial.specularColor,
                                                      objMaterial.emissiveColor,
                                                      objMaterial.shininess,
                                                      objMaterial.opacity);
-        FBXMaterial& fbxMaterial = geometry.materials[materialID];
-        fbxMaterial.materialID = materialID;
-        fbxMaterial._material = std::make_shared<graphics::Material>();
-        graphics::MaterialPointer modelMaterial = fbxMaterial._material;
+        HFMMaterial& hfmMaterial = geometry.materials[materialID];
+        hfmMaterial.materialID = materialID;
+        hfmMaterial._material = std::make_shared<graphics::Material>();
+        graphics::MaterialPointer modelMaterial = hfmMaterial._material;
 
         if (!objMaterial.diffuseTextureFilename.isEmpty()) {
-            fbxMaterial.albedoTexture.filename = objMaterial.diffuseTextureFilename;
+            hfmMaterial.albedoTexture.filename = objMaterial.diffuseTextureFilename;
         }
         if (!objMaterial.specularTextureFilename.isEmpty()) {
-            fbxMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
+            hfmMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
         }
         if (!objMaterial.emissiveTextureFilename.isEmpty()) {
-            fbxMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
+            hfmMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
         }
         if (!objMaterial.bumpTextureFilename.isEmpty()) {
-            fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
-            fbxMaterial.normalTexture.isBumpmap = true;
-            fbxMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
+            hfmMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
+            hfmMaterial.normalTexture.isBumpmap = true;
+            hfmMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
         }
         if (!objMaterial.opacityTextureFilename.isEmpty()) {
-            fbxMaterial.opacityTexture.filename = objMaterial.opacityTextureFilename;
+            hfmMaterial.opacityTexture.filename = objMaterial.opacityTextureFilename;
         }
 
-        modelMaterial->setEmissive(fbxMaterial.emissiveColor);
-        modelMaterial->setAlbedo(fbxMaterial.diffuseColor);
-        modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
-        modelMaterial->setRoughness(graphics::Material::shininessToRoughness(fbxMaterial.shininess));
+        modelMaterial->setEmissive(hfmMaterial.emissiveColor);
+        modelMaterial->setAlbedo(hfmMaterial.diffuseColor);
+        modelMaterial->setMetallic(glm::length(hfmMaterial.specularColor));
+        modelMaterial->setRoughness(graphics::Material::shininessToRoughness(hfmMaterial.shininess));
 
         bool applyTransparency = false;
         bool applyShininess = false;
@@ -971,7 +971,7 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         }      
 
         if (applyTransparency) {
-            fbxMaterial.opacity = std::max(fbxMaterial.opacity, ILLUMINATION_MODEL_MIN_OPACITY);
+            hfmMaterial.opacity = std::max(hfmMaterial.opacity, ILLUMINATION_MODEL_MIN_OPACITY);
         }
         if (applyShininess) {
             modelMaterial->setRoughness(ILLUMINATION_MODEL_APPLY_SHININESS);
@@ -985,18 +985,18 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
             modelMaterial->setFresnel(glm::vec3(1.0f));
         }
 
-        modelMaterial->setOpacity(fbxMaterial.opacity);
+        modelMaterial->setOpacity(hfmMaterial.opacity);
     }
 
     return geometryPtr;
 }
 
-void fbxDebugDump(const FBXGeometry& fbxgeo) {
-    qCDebug(modelformat) << "---------------- fbxGeometry ----------------";
+void fbxDebugDump(const HFMGeometry& fbxgeo) {
+    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
     qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
     qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
     qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
-    foreach (FBXMesh mesh, fbxgeo.meshes) {
+    foreach (HFMMesh mesh, fbxgeo.meshes) {
         qCDebug(modelformat) << "    vertices.count() =" << mesh.vertices.count();
         qCDebug(modelformat) << "    colors.count() =" << mesh.colors.count();
         qCDebug(modelformat) << "    normals.count() =" << mesh.normals.count();
@@ -1014,7 +1014,7 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "    meshExtents =" << mesh.meshExtents;
         qCDebug(modelformat) << "    modelTransform =" << mesh.modelTransform;
         qCDebug(modelformat) << "    parts.count() =" << mesh.parts.count();
-        foreach (FBXMeshPart meshPart, mesh.parts) {
+        foreach (HFMMeshPart meshPart, mesh.parts) {
             qCDebug(modelformat) << "        quadIndices.count() =" << meshPart.quadIndices.count();
             qCDebug(modelformat) << "        triangleIndices.count() =" << meshPart.triangleIndices.count();
    /*
@@ -1031,7 +1031,7 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
             */
         }
         qCDebug(modelformat) << "    clusters.count() =" << mesh.clusters.count();
-        foreach (FBXCluster cluster, mesh.clusters) {
+        foreach (HFMCluster cluster, mesh.clusters) {
             qCDebug(modelformat) << "        jointIndex =" << cluster.jointIndex;
             qCDebug(modelformat) << "        inverseBindMatrix =" << cluster.inverseBindMatrix;
         }
@@ -1040,7 +1040,7 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
     qCDebug(modelformat) << "  jointIndices =" << fbxgeo.jointIndices;
     qCDebug(modelformat) << "  joints.count() =" << fbxgeo.joints.count();
 
-    foreach (FBXJoint joint, fbxgeo.joints) {
+    foreach (HFMJoint joint, fbxgeo.joints) {
         qCDebug(modelformat) << "    isFree =" << joint.isFree;
         qCDebug(modelformat) << "    freeLineage" << joint.freeLineage;
         qCDebug(modelformat) << "    parentIndex" << joint.parentIndex;
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index e432a3ea51..edfe6f23e8 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -42,7 +42,7 @@ public:
     bool add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex,
              const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& vertexColors);
     // Return a set of one or more OBJFaces from this one, in which each is just a triangle.
-    // Even though FBXMeshPart can handle quads, it would be messy to try to keep track of mixed-size faces, so we treat everything as triangles.
+    // Even though HFMMeshPart can handle quads, it would be messy to try to keep track of mixed-size faces, so we treat everything as triangles.
     QVector<OBJFace> triangulate();
 private:
     void addFrom(const OBJFace* face, int index);
@@ -54,7 +54,7 @@ public:
 }
 ;
 // Materials and references to material names can come in any order, and different mesh parts can refer to the same material.
-// Therefore it would get pretty hacky to try to use FBXMeshPart to store these as we traverse the files.
+// Therefore it would get pretty hacky to try to use HFMMeshPart to store these as we traverse the files.
 class OBJMaterial {
 public:
     float shininess;
@@ -87,13 +87,13 @@ public:
     QString currentMaterialName;
     QHash<QString, OBJMaterial> materials;
 
-    FBXGeometry::Pointer readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
+    HFMGeometry::Pointer readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
 
 private:
     QUrl _url;
 
     QHash<QByteArray, bool> librariesSeen;
-    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
+    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
@@ -103,5 +103,5 @@ private:
 };
 
 // What are these utilities doing here? One is used by fbx loading code in VHACD Utils, and the other a general debugging utility.
-void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID);
-void fbxDebugDump(const FBXGeometry& fbxgeo);
+void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID);
+void fbxDebugDump(const HFMGeometry& fbxgeo);
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index e96815d391..a950e1df3c 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -128,7 +128,7 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
 
 void GeometryMappingResource::onGeometryMappingLoaded(bool success) {
     if (success && _geometryResource) {
-        _fbxGeometry = _geometryResource->_fbxGeometry;
+        _hfmGeometry = _geometryResource->_hfmGeometry;
         _meshParts = _geometryResource->_meshParts;
         _meshes = _geometryResource->_meshes;
         _materials = _geometryResource->_materials;
@@ -193,38 +193,38 @@ void GeometryReader::run() {
                 _url.path().toLower().endsWith(".obj.gz") ||
                 _url.path().toLower().endsWith(".gltf"))) {
 
-            FBXGeometry::Pointer fbxGeometry;
+            HFMGeometry::Pointer hfmGeometry;
 
             if (_url.path().toLower().endsWith(".fbx")) {
-                fbxGeometry.reset(readFBX(_data, _mapping, _url.path()));
-                if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) {
+                hfmGeometry.reset(readFBX(_data, _mapping, _url.path()));
+                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported FBX version");
                 }
             } else if (_url.path().toLower().endsWith(".obj")) {
-                fbxGeometry = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
+                hfmGeometry = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
             } else if (_url.path().toLower().endsWith(".obj.gz")) {
                 QByteArray uncompressedData;
                 if (gunzip(_data, uncompressedData)){
-                    fbxGeometry = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
+                    hfmGeometry = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
                 } else {
                     throw QString("failed to decompress .obj.gz");
                 }
 
             } else if (_url.path().toLower().endsWith(".gltf")) {
                 std::shared_ptr<GLTFReader> glreader = std::make_shared<GLTFReader>();
-                fbxGeometry.reset(glreader->readGLTF(_data, _mapping, _url));
-                if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) {
+                hfmGeometry.reset(glreader->readGLTF(_data, _mapping, _url));
+                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported GLTF version");
                 }
             } else {
                 throw QString("unsupported format");
             }
 
-            // Add scripts to fbxgeometry
+            // Add scripts to hfmGeometry
             if (!_mapping.value(SCRIPT_FIELD).isNull()) {
                 QVariantList scripts = _mapping.values(SCRIPT_FIELD);
                 for (auto &script : scripts) {
-                    fbxGeometry->scripts.push_back(script.toString());
+                    hfmGeometry->scripts.push_back(script.toString());
                 }
             }
 
@@ -234,7 +234,7 @@ void GeometryReader::run() {
                 qCWarning(modelnetworking) << "Abandoning load of" << _url << "; could not get strong ref";
             } else {
                 QMetaObject::invokeMethod(resource.data(), "setGeometryDefinition",
-                    Q_ARG(FBXGeometry::Pointer, fbxGeometry));
+                    Q_ARG(HFMGeometry::Pointer, hfmGeometry));
             }
         } else {
             throw QString("url is invalid");
@@ -262,7 +262,7 @@ public:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected:
-    Q_INVOKABLE void setGeometryDefinition(FBXGeometry::Pointer fbxGeometry);
+    Q_INVOKABLE void setGeometryDefinition(HFMGeometry::Pointer hfmGeometry);
 
 private:
     QVariantHash _mapping;
@@ -277,13 +277,13 @@ void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
     QThreadPool::globalInstance()->start(new GeometryReader(_self, _effectiveBaseURL, _mapping, data, _combineParts));
 }
 
-void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxGeometry) {
+void GeometryDefinitionResource::setGeometryDefinition(HFMGeometry::Pointer hfmGeometry) {
     // Assume ownership of the geometry pointer
-    _fbxGeometry = fbxGeometry;
+    _hfmGeometry = hfmGeometry;
 
     // Copy materials
     QHash<QString, size_t> materialIDAtlas;
-    for (const FBXMaterial& material : _fbxGeometry->materials) {
+    for (const HFMMaterial& material : _hfmGeometry->materials) {
         materialIDAtlas[material.materialID] = _materials.size();
         _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
     }
@@ -291,11 +291,11 @@ void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxG
     std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
     std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
     int meshID = 0;
-    for (const FBXMesh& mesh : _fbxGeometry->meshes) {
+    for (const HFMMesh& mesh : _hfmGeometry->meshes) {
         // Copy mesh pointers
         meshes->emplace_back(mesh._mesh);
         int partID = 0;
-        for (const FBXMeshPart& part : mesh.parts) {
+        for (const HFMMeshPart& part : mesh.parts) {
             // Construct local parts
             parts->push_back(std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]));
             partID++;
@@ -371,7 +371,7 @@ const QVariantMap Geometry::getTextures() const {
 
 // FIXME: The materials should only be copied when modified, but the Model currently caches the original
 Geometry::Geometry(const Geometry& geometry) {
-    _fbxGeometry = geometry._fbxGeometry;
+    _hfmGeometry = geometry._hfmGeometry;
     _meshes = geometry._meshes;
     _meshParts = geometry._meshParts;
 
@@ -444,8 +444,8 @@ void GeometryResource::deleter() {
 }
 
 void GeometryResource::setTextures() {
-    if (_fbxGeometry) {
-        for (const FBXMaterial& material : _fbxGeometry->materials) {
+    if (_hfmGeometry) {
+        for (const HFMMaterial& material : _hfmGeometry->materials) {
             _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
         }
     }
@@ -512,7 +512,7 @@ const QString& NetworkMaterial::getTextureName(MapChannel channel) {
     return NO_TEXTURE;
 }
 
-QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const FBXTexture& texture) {
+QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const HFMTexture& texture) {
     if (texture.content.isEmpty()) {
         // External file: search relative to the baseUrl, in case filename is relative
         return baseUrl.resolved(QUrl(texture.filename));
@@ -529,22 +529,22 @@ QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const FBXTexture& textu
     }
 }
 
-graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const FBXTexture& fbxTexture,
+graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
                                                           image::TextureUsage::Type type, MapChannel channel) {
 
     if (baseUrl.isEmpty()) {
         return nullptr;
     }
 
-    const auto url = getTextureUrl(baseUrl, fbxTexture);
-    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, fbxTexture.content, fbxTexture.maxNumPixels);
-    _textures[channel] = Texture { fbxTexture.name, texture };
+    const auto url = getTextureUrl(baseUrl, hfmTexture);
+    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels);
+    _textures[channel] = Texture { hfmTexture.name, texture };
 
     auto map = std::make_shared<graphics::TextureMap>();
     if (texture) {
         map->setTextureSource(texture->_textureSource);
     }
-    map->setTextureTransform(fbxTexture.transform);
+    map->setTextureTransform(hfmTexture.transform);
 
     return map;
 }
@@ -624,7 +624,7 @@ void NetworkMaterial::setLightmapMap(const QUrl& url) {
     }
 }
 
-NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl) :
+NetworkMaterial::NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl) :
     graphics::Material(*material._material),
     _textures(MapChannel::NUM_MAP_CHANNELS)
 {
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 5cbe96ea03..2283c355d8 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -45,9 +45,9 @@ public:
     // Mutable, but must retain structure of vector
     using NetworkMaterials = std::vector<std::shared_ptr<NetworkMaterial>>;
 
-    bool isGeometryLoaded() const { return (bool)_fbxGeometry; }
+    bool isGeometryLoaded() const { return (bool)_hfmGeometry; }
 
-    const FBXGeometry& getFBXGeometry() const { return *_fbxGeometry; }
+    const HFMGeometry& getHFMGeometry() const { return *_hfmGeometry; }
     const GeometryMeshes& getMeshes() const { return *_meshes; }
     const std::shared_ptr<NetworkMaterial> getShapeMaterial(int shapeID) const;
 
@@ -62,7 +62,7 @@ protected:
     friend class GeometryMappingResource;
 
     // Shared across all geometries, constant throughout lifetime
-    std::shared_ptr<const FBXGeometry> _fbxGeometry;
+    std::shared_ptr<const HFMGeometry> _hfmGeometry;
     std::shared_ptr<const GeometryMeshes> _meshes;
     std::shared_ptr<const GeometryMeshParts> _meshParts;
 
@@ -94,7 +94,7 @@ protected:
 
     // Geometries may not hold onto textures while cached - that is for the texture cache
     // Instead, these methods clear and reset textures from the geometry when caching/loading
-    bool shouldSetTextures() const { return _fbxGeometry && _materials.empty(); }
+    bool shouldSetTextures() const { return _hfmGeometry && _materials.empty(); }
     void setTextures();
     void resetTextures();
 
@@ -165,7 +165,7 @@ public:
     using MapChannel = graphics::Material::MapChannel;
 
     NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
-    NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl);
+    NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl);
     NetworkMaterial(const NetworkMaterial& material);
 
     void setAlbedoMap(const QUrl& url, bool useAlphaChannel);
@@ -201,8 +201,8 @@ protected:
 
 private:
     // Helpers for the ctors
-    QUrl getTextureUrl(const QUrl& baseUrl, const FBXTexture& fbxTexture);
-    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const FBXTexture& fbxTexture,
+    QUrl getTextureUrl(const QUrl& baseUrl, const HFMTexture& hfmTexture);
+    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
                                              image::TextureUsage::Type type, MapChannel channel);
     graphics::TextureMapPointer fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel);
 
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 81a017a46d..31d6cef060 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -32,8 +32,8 @@ bool CauterizedModel::updateGeometry() {
     bool needsFullUpdate = Model::updateGeometry();
     if (_isCauterized && needsFullUpdate) {
         assert(_cauterizeMeshStates.empty());
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
-        foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
+        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
             Model::MeshState state;
             if (_useDualQuaternionSkinning) {
                 state.clusterDualQuaternions.resize(mesh.clusters.size());
@@ -76,7 +76,7 @@ void CauterizedModel::createRenderItemSet() {
         // Run through all of the meshes, and place them into their segregated, but unsorted buckets
         int shapeID = 0;
         uint32_t numMeshes = (uint32_t)meshes.size();
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
         for (uint32_t i = 0; i < numMeshes; i++) {
             const auto& mesh = meshes.at(i);
             if (!mesh) {
@@ -86,7 +86,7 @@ void CauterizedModel::createRenderItemSet() {
             // Create the render payloads
             int numParts = (int)mesh->getNumParts();
             for (int partIndex = 0; partIndex < numParts; partIndex++) {
-                initializeBlendshapes(fbxGeometry.meshes[i], i);
+                initializeBlendshapes(hfmGeometry.meshes[i], i);
 
                 auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
                 _modelMeshRenderItems << std::static_pointer_cast<ModelMeshPartPayload>(ptr);
@@ -109,13 +109,13 @@ void CauterizedModel::updateClusterMatrices() {
         return;
     }
     _needsUpdateClusterMatrices = false;
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     for (int i = 0; i < (int)_meshStates.size(); i++) {
         Model::MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
                 auto jointPose = _rig.getJointPose(cluster.jointIndex);
                 Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
@@ -145,10 +145,10 @@ void CauterizedModel::updateClusterMatrices() {
 
         for (int i = 0; i < _cauterizeMeshStates.size(); i++) {
             Model::MeshState& state = _cauterizeMeshStates[i];
-            const FBXMesh& mesh = geometry.meshes.at(i);
+            const HFMMesh& mesh = geometry.meshes.at(i);
 
             for (int j = 0; j < mesh.clusters.size(); j++) {
-                const FBXCluster& cluster = mesh.clusters.at(j);
+                const HFMCluster& cluster = mesh.clusters.at(j);
 
                 if (_useDualQuaternionSkinning) {
                     if (_cauterizeBoneSet.find(cluster.jointIndex) == _cauterizeBoneSet.end()) {
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 4ebd92bb05..8e2541fdda 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -260,8 +260,8 @@ void ModelMeshPartPayload::initCache(const ModelPointer& model) {
         _hasColorAttrib = vertexFormat->hasAttribute(gpu::Stream::COLOR);
         _isSkinned = vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_WEIGHT) && vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_INDEX);
 
-        const FBXGeometry& geometry = model->getFBXGeometry();
-        const FBXMesh& mesh = geometry.meshes.at(_meshIndex);
+        const HFMGeometry& geometry = model->getHFMGeometry();
+        const HFMMesh& mesh = geometry.meshes.at(_meshIndex);
 
         _isBlendShaped = !mesh.blendshapes.isEmpty();
         _hasTangents = !mesh.tangents.isEmpty();
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 53009e8bfa..65b3fef7c0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -183,7 +183,7 @@ bool Model::shouldInvalidatePayloadShapeKey(int meshIndex) {
         return true;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     const auto& networkMeshes = getGeometry()->getMeshes();
     // if our index is ever out of range for either meshes or networkMeshes, then skip it, and set our _meshGroupsKnown
     // to false to rebuild out mesh groups.
@@ -278,7 +278,7 @@ void Model::setRenderItemsNeedUpdate() {
 
 void Model::reset() {
     if (isLoaded()) {
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         _rig.reset(geometry);
         emit rigReset();
         emit rigReady();
@@ -295,13 +295,13 @@ bool Model::updateGeometry() {
     _needsReload = false;
 
     // TODO: should all Models have a valid _rig?
-    if (_rig.jointStatesEmpty() && getFBXGeometry().joints.size() > 0) {
+    if (_rig.jointStatesEmpty() && getHFMGeometry().joints.size() > 0) {
         initJointStates();
         assert(_meshStates.empty());
 
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
         int i = 0;
-        foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
+        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
             MeshState state;
             state.clusterDualQuaternions.resize(mesh.clusters.size());
             state.clusterMatrices.resize(mesh.clusters.size());
@@ -319,7 +319,7 @@ bool Model::updateGeometry() {
 
 // virtual
 void Model::initJointStates() {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
 
     _rig.initJointStates(geometry, modelOffset);
@@ -363,7 +363,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         if (!_triangleSetsValid) {
             calculateTriangleSets(geometry);
         }
@@ -506,7 +506,7 @@ bool Model::findParabolaIntersectionAgainstSubMeshes(const glm::vec3& origin, co
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         if (!_triangleSetsValid) {
             calculateTriangleSets(geometry);
         }
@@ -641,7 +641,7 @@ bool Model::convexHullContains(glm::vec3 point) {
         QMutexLocker locker(&_mutex);
 
         if (!_triangleSetsValid) {
-            calculateTriangleSets(getFBXGeometry());
+            calculateTriangleSets(getHFMGeometry());
         }
 
         // If we are inside the models box, then consider the submeshes...
@@ -753,14 +753,14 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
     }
     // update triangles for picking
     {
-        FBXGeometry geometry;
+        HFMGeometry geometry;
         for (const auto& newMesh : meshes) {
-            FBXMesh mesh;
+            HFMMesh mesh;
             mesh._mesh = newMesh.getMeshPointer();
             mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION);
             int numParts = (int)newMesh.getMeshPointer()->getNumParts();
             for (int partID = 0; partID < numParts; partID++) {
-                FBXMeshPart part;
+                HFMMeshPart part;
                 part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
                 mesh.parts << part;
             }
@@ -789,12 +789,12 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
         return result;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     int numberOfMeshes = geometry.meshes.size();
     int shapeID = 0;
     for (int i = 0; i < numberOfMeshes; i++) {
-        const FBXMesh& fbxMesh = geometry.meshes.at(i);
-        if (auto mesh = fbxMesh._mesh) {
+        const HFMMesh& hfmMesh = geometry.meshes.at(i);
+        if (auto mesh = hfmMesh._mesh) {
             result.append(mesh);
 
             int numParts = (int)mesh->getNumParts();
@@ -808,7 +808,7 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
     return result;
 }
 
-void Model::calculateTriangleSets(const FBXGeometry& geometry) {
+void Model::calculateTriangleSets(const HFMGeometry& geometry) {
     PROFILE_RANGE(render, __FUNCTION__);
 
     int numberOfMeshes = geometry.meshes.size();
@@ -818,14 +818,14 @@ void Model::calculateTriangleSets(const FBXGeometry& geometry) {
     _modelSpaceMeshTriangleSets.resize(numberOfMeshes);
 
     for (int i = 0; i < numberOfMeshes; i++) {
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
 
         const int numberOfParts = mesh.parts.size();
         auto& meshTriangleSets = _modelSpaceMeshTriangleSets[i];
         meshTriangleSets.resize(numberOfParts);
 
         for (int j = 0; j < numberOfParts; j++) {
-            const FBXMeshPart& part = mesh.parts.at(j);
+            const HFMMeshPart& part = mesh.parts.at(j);
 
             auto& partTriangleSet = meshTriangleSets[j];
 
@@ -1114,7 +1114,7 @@ Extents Model::getBindExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& bindExtents = getFBXGeometry().bindExtents;
+    const Extents& bindExtents = getHFMGeometry().bindExtents;
     Extents scaledExtents = { bindExtents.minimum * _scale, bindExtents.maximum * _scale };
     return scaledExtents;
 }
@@ -1128,12 +1128,12 @@ Extents Model::getMeshExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& extents = getFBXGeometry().meshExtents;
+    const Extents& extents = getHFMGeometry().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum * _scale, maximum * _scale };
     return scaledExtents;
 }
@@ -1143,12 +1143,12 @@ Extents Model::getUnscaledMeshExtents() const {
         return Extents();
     }
 
-    const Extents& extents = getFBXGeometry().meshExtents;
+    const Extents& extents = getHFMGeometry().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum, maximum };
 
     return scaledExtents;
@@ -1171,11 +1171,11 @@ void Model::setJointTranslation(int index, bool valid, const glm::vec3& translat
 }
 
 int Model::getParentJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getFBXGeometry().joints.at(jointIndex).parentIndex : -1;
+    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).parentIndex : -1;
 }
 
 int Model::getLastFreeJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getFBXGeometry().joints.at(jointIndex).freeLineage.last() : -1;
+    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).freeLineage.last() : -1;
 }
 
 void Model::setTextures(const QVariantMap& textures) {
@@ -1275,7 +1275,7 @@ QStringList Model::getJointNames() const {
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
-    return isActive() ? getFBXGeometry().getJointNames() : QStringList();
+    return isActive() ? getHFMGeometry().getJointNames() : QStringList();
 }
 
 void Model::setScaleToFit(bool scaleToFit, const glm::vec3& dimensions, bool forceRescale) {
@@ -1415,12 +1415,12 @@ void Model::updateClusterMatrices() {
     }
 
     _needsUpdateClusterMatrices = false;
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
                 auto jointPose = _rig.getJointPose(cluster.jointIndex);
                 Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
@@ -1505,7 +1505,7 @@ void Model::createRenderItemSet() {
     // Run through all of the meshes, and place them into their segregated, but unsorted buckets
     int shapeID = 0;
     uint32_t numMeshes = (uint32_t)meshes.size();
-    auto& fbxGeometry = getFBXGeometry();
+    auto& hfmGeometry = getHFMGeometry();
     for (uint32_t i = 0; i < numMeshes; i++) {
         const auto& mesh = meshes.at(i);
         if (!mesh) {
@@ -1515,7 +1515,7 @@ void Model::createRenderItemSet() {
         // Create the render payloads
         int numParts = (int)mesh->getNumParts();
         for (int partIndex = 0; partIndex < numParts; partIndex++) {
-            initializeBlendshapes(fbxGeometry.meshes[i], i);
+            initializeBlendshapes(hfmGeometry.meshes[i], i);
             _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
             auto material = getGeometry()->getShapeMaterial(shapeID);
             _modelMeshMaterialNames.push_back(material ? material->getName() : "");
@@ -1600,7 +1600,7 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
 class CollisionRenderGeometry : public Geometry {
 public:
     CollisionRenderGeometry(graphics::MeshPointer mesh) {
-        _fbxGeometry = std::make_shared<FBXGeometry>();
+        _hfmGeometry = std::make_shared<HFMGeometry>();
         std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
         meshes->push_back(mesh);
         _meshes = meshes;
@@ -1656,9 +1656,9 @@ void Blender::run() {
     if (_model && _model->isLoaded()) {
         DETAILED_PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } });
         int offset = 0;
-        auto meshes = _model->getFBXGeometry().meshes;
+        auto meshes = _model->getHFMGeometry().meshes;
         int meshIndex = 0;
-        foreach(const FBXMesh& mesh, meshes) {
+        foreach(const HFMMesh& mesh, meshes) {
             auto modelMeshBlendshapeOffsets = _model->_blendshapeOffsets.find(meshIndex++);
             if (mesh.blendshapes.isEmpty() || modelMeshBlendshapeOffsets == _model->_blendshapeOffsets.end()) {
                 // Not blendshaped or not initialized
@@ -1688,7 +1688,7 @@ void Blender::run() {
                 }
 
                 float normalCoefficient = vertexCoefficient * NORMAL_COEFFICIENT_SCALE;
-                const FBXBlendshape& blendshape = mesh.blendshapes.at(i);
+                const HFMBlendshape& blendshape = mesh.blendshapes.at(i);
 
                 tbb::parallel_for(tbb::blocked_range<int>(0, blendshape.indices.size()), [&](const tbb::blocked_range<int>& range) {
                     for (auto j = range.begin(); j < range.end(); j++) {
@@ -1731,7 +1731,7 @@ bool Model::maybeStartBlender() {
     return false;
 }
 
-void Model::initializeBlendshapes(const FBXMesh& mesh, int index) {
+void Model::initializeBlendshapes(const HFMMesh& mesh, int index) {
     if (mesh.blendshapes.empty()) {
         // mesh doesn't have blendshape, did we allocate one though ?
         if (_blendshapeOffsets.find(index) != _blendshapeOffsets.end()) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 71809821eb..db5625b3d8 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -185,7 +185,7 @@ public:
 
     /// Provided as a convenience, will crash if !isLoaded()
     // And so that getGeometry() isn't chained everywhere
-    const FBXGeometry& getFBXGeometry() const { assert(isLoaded()); return _renderGeometry->getFBXGeometry(); }
+    const HFMGeometry& getHFMGeometry() const { assert(isLoaded()); return _renderGeometry->getHFMGeometry(); }
 
     bool isActive() const { return isLoaded(); }
 
@@ -450,7 +450,7 @@ protected:
 
     bool _overrideModelTransform { false };
     bool _triangleSetsValid { false };
-    void calculateTriangleSets(const FBXGeometry& geometry);
+    void calculateTriangleSets(const HFMGeometry& geometry);
     std::vector<std::vector<TriangleSet>> _modelSpaceMeshTriangleSets; // model space triangles for all sub meshes
 
     virtual void createRenderItemSet();
@@ -506,7 +506,7 @@ protected:
 
     bool shouldInvalidatePayloadShapeKey(int meshIndex);
 
-    void initializeBlendshapes(const FBXMesh& mesh, int index);
+    void initializeBlendshapes(const HFMMesh& mesh, int index);
 
 private:
     float _loadingPriority { 0.0f };
diff --git a/libraries/render-utils/src/SoftAttachmentModel.cpp b/libraries/render-utils/src/SoftAttachmentModel.cpp
index 90015768d0..77b09caa1d 100644
--- a/libraries/render-utils/src/SoftAttachmentModel.cpp
+++ b/libraries/render-utils/src/SoftAttachmentModel.cpp
@@ -41,14 +41,14 @@ void SoftAttachmentModel::updateClusterMatrices() {
 
     _needsUpdateClusterMatrices = false;
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
 
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
 
             // TODO: cache these look-ups as an optimization
             int jointIndexOverride = getJointIndexOverride(cluster.jointIndex);
diff --git a/tests-manual/gpu/src/TestFbx.cpp b/tests-manual/gpu/src/TestFbx.cpp
index 538bb0a973..ba94fb810c 100644
--- a/tests-manual/gpu/src/TestFbx.cpp
+++ b/tests-manual/gpu/src/TestFbx.cpp
@@ -100,7 +100,7 @@ bool TestFbx::isReady() const {
 
 void TestFbx::parseFbx(const QByteArray& fbxData) {
     QVariantHash mapping;
-    FBXGeometry* fbx = readFBX(fbxData, mapping);
+    HFMGeometry* fbx = readFBX(fbxData, mapping);
     size_t totalVertexCount = 0;
     size_t totalIndexCount = 0;
     size_t totalPartCount = 0;
diff --git a/tests-manual/gpu/src/TestFbx.h b/tests-manual/gpu/src/TestFbx.h
index 391fff1091..4e22928460 100644
--- a/tests-manual/gpu/src/TestFbx.h
+++ b/tests-manual/gpu/src/TestFbx.h
@@ -11,7 +11,7 @@
 
 #include <render/ShapePipeline.h>
 
-class FBXGeometry;
+class HFMGeometry;
 
 class TestFbx : public GpuTestBase {
     size_t _partCount { 0 };
diff --git a/tests/animation/src/AnimInverseKinematicsTests.cpp b/tests/animation/src/AnimInverseKinematicsTests.cpp
index f5d3597f56..f51fe12ecb 100644
--- a/tests/animation/src/AnimInverseKinematicsTests.cpp
+++ b/tests/animation/src/AnimInverseKinematicsTests.cpp
@@ -28,8 +28,8 @@ const glm::quat identity = glm::quat();
 const glm::quat quaterTurnAroundZ = glm::angleAxis(0.5f * PI, zAxis);
 
 
-void makeTestFBXJoints(FBXGeometry& geometry) {
-    FBXJoint joint;
+void makeTestFBXJoints(HFMGeometry& geometry) {
+    HFMJoint joint;
     joint.isFree = false;
     joint.freeLineage.clear();
     joint.parentIndex = -1;
@@ -79,7 +79,7 @@ void makeTestFBXJoints(FBXGeometry& geometry) {
 
     // compute each joint's transform
     for (int i = 1; i < (int)geometry.joints.size(); ++i) {
-        FBXJoint& j = geometry.joints[i];
+        HFMJoint& j = geometry.joints[i];
         int parentIndex = j.parentIndex;
         // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
         j.transform = geometry.joints[parentIndex].transform *
@@ -96,7 +96,7 @@ void AnimInverseKinematicsTests::testSingleChain() {
 
     AnimContext context(false, false, false, glm::mat4(), glm::mat4());
 
-    FBXGeometry geometry;
+    HFMGeometry geometry;
     makeTestFBXJoints(geometry);
 
     // create a skeleton and doll
diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.cpp b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
index e9d8243e38..5107931da1 100644
--- a/tools/skeleton-dump/src/SkeletonDumpApp.cpp
+++ b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
@@ -54,8 +54,8 @@ SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc
         return;
     }
     QByteArray blob = file.readAll();
-    std::unique_ptr<FBXGeometry> fbxGeometry(readFBX(blob, QVariantHash()));
-    std::unique_ptr<AnimSkeleton> skeleton(new AnimSkeleton(*fbxGeometry));
+    std::unique_ptr<HFMGeometry> geometry(readFBX(blob, QVariantHash()));
+    std::unique_ptr<AnimSkeleton> skeleton(new AnimSkeleton(*geometry));
     skeleton->dump(verbose);
 }
 
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index a52e948f01..bb2958e11d 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -19,16 +19,16 @@
 
 // FBXReader jumbles the order of the meshes by reading them back out of a hashtable.  This will put
 // them back in the order in which they appeared in the file.
-bool FBXGeometryLessThan(const FBXMesh& e1, const FBXMesh& e2) {
+bool HFMGeometryLessThan(const HFMMesh& e1, const HFMMesh& e2) {
     return e1.meshIndex < e2.meshIndex;
 }
-void reSortFBXGeometryMeshes(FBXGeometry& geometry) {
-    qSort(geometry.meshes.begin(), geometry.meshes.end(), FBXGeometryLessThan);
+void reSortHFMGeometryMeshes(HFMGeometry& geometry) {
+    qSort(geometry.meshes.begin(), geometry.meshes.end(), HFMGeometryLessThan);
 }
 
 
 // Read all the meshes from provided FBX file
-bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
+bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMGeometry& result) {
     if (_verbose) {
         qDebug() << "reading FBX file =" << filename << "...";
     }
@@ -41,7 +41,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
     }
     try {
         QByteArray fbxContents = fbx.readAll();
-        FBXGeometry::Pointer geom;
+        HFMGeometry::Pointer geom;
         if (filename.toLower().endsWith(".obj")) {
             bool combineParts = false;
             geom = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
@@ -53,7 +53,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
         }
         result = *geom;
 
-        reSortFBXGeometryMeshes(result);
+        reSortHFMGeometryMeshes(result);
     } catch (const QString& error) {
         qWarning() << "error reading" << filename << ":" << error;
         return false;
@@ -63,7 +63,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
 }
 
 
-void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& triangleIndices) {
+void getTrianglesInMeshPart(const HFMMeshPart &meshPart, std::vector<int>& triangleIndices) {
     // append triangle indices
     triangleIndices.reserve(triangleIndices.size() + (size_t)meshPart.triangleIndices.size());
     for (auto index : meshPart.triangleIndices) {
@@ -88,12 +88,12 @@ void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& trian
     }
 }
 
-void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometryOffset, FBXMesh& result) const {
+void vhacd::VHACDUtil::fattenMesh(const HFMMesh& mesh, const glm::mat4& geometryOffset, HFMMesh& result) const {
     // this is used to make meshes generated from a highfield collidable.  each triangle
     // is converted into a tetrahedron and made into its own mesh-part.
 
     std::vector<int> triangleIndices;
-    foreach (const FBXMeshPart &meshPart, mesh.parts) {
+    foreach (const HFMMeshPart &meshPart, mesh.parts) {
         getTrianglesInMeshPart(meshPart, triangleIndices);
     }
 
@@ -145,7 +145,7 @@ void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometry
         int index3 = result.vertices.size();
         result.vertices << p3; // add the new point to the result mesh
 
-        FBXMeshPart newMeshPart;
+        HFMMeshPart newMeshPart;
         setMeshPartDefaults(newMeshPart, "unknown");
         newMeshPart.triangleIndices << index0 << index1 << index2;
         newMeshPart.triangleIndices << index0 << index3 << index1;
@@ -155,7 +155,7 @@ void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometry
     }
 }
 
-AABox getAABoxForMeshPart(const FBXMesh& mesh, const FBXMeshPart &meshPart) {
+AABox getAABoxForMeshPart(const HFMMesh& mesh, const HFMMeshPart &meshPart) {
     AABox aaBox;
     const int TRIANGLE_STRIDE = 3;
     for (int i = 0; i < meshPart.triangleIndices.size(); i += TRIANGLE_STRIDE) {
@@ -242,7 +242,7 @@ bool isClosedManifold(const std::vector<int>& triangleIndices) {
     return true;
 }
 
-void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& resultMesh) const {
+void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, HFMMesh& resultMesh) const {
     // Number of hulls for this input meshPart
     uint32_t numHulls = convexifier->GetNConvexHulls();
     if (_verbose) {
@@ -256,8 +256,8 @@ void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& res
         VHACD::IVHACD::ConvexHull hull;
         convexifier->GetConvexHull(j, hull);
 
-        resultMesh.parts.append(FBXMeshPart());
-        FBXMeshPart& resultMeshPart = resultMesh.parts.last();
+        resultMesh.parts.append(HFMMeshPart());
+        HFMMeshPart& resultMeshPart = resultMesh.parts.last();
 
         int hullIndexStart = resultMesh.vertices.size();
         resultMesh.vertices.reserve(hullIndexStart + hull.m_nPoints);
@@ -288,9 +288,9 @@ float computeDt(uint64_t start) {
     return (float)(usecTimestampNow() - start) / (float)USECS_PER_SECOND;
 }
 
-bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
+bool vhacd::VHACDUtil::computeVHACD(HFMGeometry& geometry,
                                     VHACD::IVHACD::Parameters params,
-                                    FBXGeometry& result,
+                                    HFMGeometry& result,
                                     float minimumMeshSize, float maximumMeshSize) {
     if (_verbose) {
         qDebug() << "meshes =" << geometry.meshes.size();
@@ -298,7 +298,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
     // count the mesh-parts
     int numParts = 0;
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
         numParts += mesh.parts.size();
     }
     if (_verbose) {
@@ -308,15 +308,15 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
     VHACD::IVHACD * convexifier = VHACD::CreateVHACD();
 
     result.meshExtents.reset();
-    result.meshes.append(FBXMesh());
-    FBXMesh &resultMesh = result.meshes.last();
+    result.meshes.append(HFMMesh());
+    HFMMesh &resultMesh = result.meshes.last();
 
     const uint32_t POINT_STRIDE = 3;
     const uint32_t TRIANGLE_STRIDE = 3;
 
     int meshIndex = 0;
     int validPartsFound = 0;
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
 
         // find duplicate points
         int numDupes = 0;
@@ -354,7 +354,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
         int partIndex = 0;
         std::vector<int> triangleIndices;
-        foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMeshPart &meshPart, mesh.parts) {
             triangleIndices.clear();
             getTrianglesInMeshPart(meshPart, triangleIndices);
 
@@ -421,7 +421,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
             triangleIndices.clear();
             for (auto index : openParts) {
-                const FBXMeshPart &meshPart = mesh.parts[index];
+                const HFMMeshPart &meshPart = mesh.parts[index];
                 getTrianglesInMeshPart(meshPart, triangleIndices);
             }
 
diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h
index 35ec3ef56b..64e86ed7df 100644
--- a/tools/vhacd-util/src/VHACDUtil.h
+++ b/tools/vhacd-util/src/VHACDUtil.h
@@ -27,16 +27,16 @@ namespace vhacd {
     public:
         void setVerbose(bool verbose) { _verbose = verbose; }
 
-        bool loadFBX(const QString filename, FBXGeometry& result);
+        bool loadFBX(const QString filename, HFMGeometry& result);
 
-        void fattenMesh(const FBXMesh& mesh, const glm::mat4& gometryOffset, FBXMesh& result) const;
+        void fattenMesh(const HFMMesh& mesh, const glm::mat4& gometryOffset, HFMMesh& result) const;
 
-        bool computeVHACD(FBXGeometry& geometry,
+        bool computeVHACD(HFMGeometry& geometry,
                           VHACD::IVHACD::Parameters params,
-                          FBXGeometry& result,
+                          HFMGeometry& result,
                           float minimumMeshSize, float maximumMeshSize);
 
-        void getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& resultMesh) const;
+        void getConvexResults(VHACD::IVHACD* convexifier, HFMMesh& resultMesh) const;
 
         ~VHACDUtil();
 
@@ -55,6 +55,6 @@ namespace vhacd {
     };
 }
 
-AABox getAABoxForMeshPart(const FBXMeshPart &meshPart);
+AABox getAABoxForMeshPart(const HFMMeshPart &meshPart);
 
 #endif //hifi_VHACDUtil_h
diff --git a/tools/vhacd-util/src/VHACDUtilApp.cpp b/tools/vhacd-util/src/VHACDUtilApp.cpp
index c263dce609..0941198234 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.cpp
+++ b/tools/vhacd-util/src/VHACDUtilApp.cpp
@@ -36,7 +36,7 @@ QString formatFloat(double n) {
 }
 
 
-bool VHACDUtilApp::writeOBJ(QString outFileName, FBXGeometry& geometry, bool outputCentimeters, int whichMeshPart) {
+bool VHACDUtilApp::writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart) {
     QFile file(outFileName);
     if (!file.open(QIODevice::WriteOnly)) {
         qWarning() << "unable to write to" << outFileName;
@@ -56,9 +56,9 @@ bool VHACDUtilApp::writeOBJ(QString outFileName, FBXGeometry& geometry, bool out
 
     int vertexIndexOffset = 0;
 
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
         bool verticesHaveBeenOutput = false;
-        foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMeshPart &meshPart, mesh.parts) {
             if (whichMeshPart >= 0 && nth != (unsigned int) whichMeshPart) {
                 nth++;
                 continue;
@@ -297,7 +297,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     // load the mesh
-    FBXGeometry fbx;
+    HFMGeometry fbx;
     auto begin = std::chrono::high_resolution_clock::now();
     if (!vUtil.loadFBX(inputFilename, fbx)){
         _returnCode = VHACD_RETURN_CODE_FAILURE_TO_READ;
@@ -315,8 +315,8 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
         QVector<QString> infileExtensions = {"fbx", "obj"};
         QString baseFileName = fileNameWithoutExtension(outputFilename, infileExtensions);
         int count = 0;
-        foreach (const FBXMesh& mesh, fbx.meshes) {
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 QString outputFileName = baseFileName + "-" + QString::number(count) + ".obj";
                 writeOBJ(outputFileName, fbx, outputCentimeters, count);
                 count++;
@@ -358,7 +358,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
         }
         begin = std::chrono::high_resolution_clock::now();
 
-        FBXGeometry result;
+        HFMGeometry result;
         bool success = vUtil.computeVHACD(fbx, params, result, minimumMeshSize, maximumMeshSize);
 
         end = std::chrono::high_resolution_clock::now();
@@ -377,9 +377,9 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
 
         int totalVertices = 0;
         int totalTriangles = 0;
-        foreach (const FBXMesh& mesh, result.meshes) {
+        foreach (const HFMMesh& mesh, result.meshes) {
             totalVertices += mesh.vertices.size();
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 totalTriangles += meshPart.triangleIndices.size() / 3;
                 // each quad was made into two triangles
                 totalTriangles += 2 * meshPart.quadIndices.size() / 4;
@@ -398,17 +398,17 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     if (fattenFaces) {
-        FBXGeometry newFbx;
-        FBXMesh result;
+        HFMGeometry newFbx;
+        HFMMesh result;
 
         // count the mesh-parts
         unsigned int meshCount = 0;
-        foreach (const FBXMesh& mesh, fbx.meshes) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
             meshCount += mesh.parts.size();
         }
 
         result.modelTransform = glm::mat4(); // Identity matrix
-        foreach (const FBXMesh& mesh, fbx.meshes) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
             vUtil.fattenMesh(mesh, fbx.offset, result);
         }
 
diff --git a/tools/vhacd-util/src/VHACDUtilApp.h b/tools/vhacd-util/src/VHACDUtilApp.h
index 0d75275802..3db49456a0 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.h
+++ b/tools/vhacd-util/src/VHACDUtilApp.h
@@ -28,7 +28,7 @@ public:
     VHACDUtilApp(int argc, char* argv[]);
     ~VHACDUtilApp();
 
-    bool writeOBJ(QString outFileName, FBXGeometry& geometry, bool outputCentimeters, int whichMeshPart = -1);
+    bool writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart = -1);
 
     int getReturnCode() const { return _returnCode; }
 

From e5f06690b509480d8b16c6b2180cab63a84b0e35 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Tue, 30 Oct 2018 17:31:31 -0700
Subject: [PATCH 21/73] Strip out references to 'my purchases' vs 'my items'
 code

---
 .../qml/hifi/commerce/purchases/Purchases.qml | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 7297e046e2..09cea01ccf 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -33,7 +33,6 @@ Rectangle {
     property bool securityImageResultReceived: false;
     property bool purchasesReceived: false;
     property bool punctuationMode: false;
-    property bool isShowingMyItems: false;
     property bool isDebuggingFirstUseTutorial: false;
     property string installedApps;
     property bool keyboardRaised: false;
@@ -105,10 +104,6 @@ Rectangle {
         }
     }
 
-    onIsShowingMyItemsChanged: {
-        getPurchases();
-    }
-
     Timer {
         id: notSetUpTimer;
         interval: 200;
@@ -457,7 +452,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.leftMargin: 16;
                 width: paintedWidth;
-                text: isShowingMyItems ? "My Items" : "Inventory";
+                text: "Inventory";
                 color: hifi.colors.black;
                 size: 22;
             }
@@ -520,6 +515,7 @@ Rectangle {
                 onTextChanged: {
                     purchasesModel.searchFilter = filterBar.text;
                     filterBar.previousText = filterBar.text;
+
                 }
             }
         }
@@ -543,9 +539,8 @@ Rectangle {
             listModelName: 'purchases';
             listView: purchasesContentsList;
             getPage: function () {
-                console.debug('getPage', purchasesModel.listModelName, root.isShowingMyItems, filterBar.primaryFilter_filterName, purchasesModel.currentPageToRetrieve, purchasesModel.itemsPerPage);
+                console.debug('getPage', purchasesModel.listModelName, filterBar.primaryFilter_filterName, purchasesModel.currentPageToRetrieve, purchasesModel.itemsPerPage);
                 Commerce.inventory(
-                    root.isShowingMyItems ? "proofs" : "purchased",
                     filterBar.primaryFilter_filterName,
                     filterBar.text,
                     purchasesModel.currentPageToRetrieve,
@@ -596,7 +591,6 @@ Rectangle {
                 upgradeUrl: model.upgrade_url;
                 upgradeTitle: model.upgrade_title;
                 itemType: model.item_type;
-                isShowingMyItems: root.isShowingMyItems;
                 valid: model.valid;
                 anchors.topMargin: 10;
                 anchors.bottomMargin: 10;
@@ -807,7 +801,8 @@ Rectangle {
 
         Rectangle {
             id: updatesAvailableBanner;
-            visible: root.numUpdatesAvailable > 0 && !root.isShowingMyItems;
+            visible: root.numUpdatesAvailable > 0 &&
+                     filterBar.primaryFilter_filterName !== "proofs";
             anchors.bottom: parent.bottom;
             anchors.left: parent.left;
             anchors.right: parent.right;
@@ -868,9 +863,8 @@ Rectangle {
             id: noItemsAlertContainer;
             visible: !purchasesContentsList.visible &&
                 root.purchasesReceived &&
-                root.isShowingMyItems &&
                 filterBar.text === "" &&
-                filterBar.primaryFilter_displayName === "";
+                filterBar.primaryFilter_filterName === "proofs";
             anchors.top: filterBarContainer.bottom;
             anchors.topMargin: 12;
             anchors.left: parent.left;
@@ -918,7 +912,6 @@ Rectangle {
             id: noPurchasesAlertContainer;
             visible: !purchasesContentsList.visible &&
                 root.purchasesReceived &&
-                !root.isShowingMyItems &&
                 filterBar.text === "" &&
                 filterBar.primaryFilter_displayName === "";
             anchors.top: filterBarContainer.bottom;
@@ -1051,7 +1044,9 @@ Rectangle {
                 filterBar.text = message.filterText ? message.filterText : "";
             break;
             case 'purchases_showMyItems':
-                root.isShowingMyItems = true;
+                filterBar.primaryFilter_filterName = "proofs";
+                filterBar.primaryFilter_displayName = "Proofs";
+                filterBar.primaryFilter_index = 6;
             break;
             case 'updateConnections':
                 sendAsset.updateConnections(message.connections);

From 93cff8dfdabe1691e5212867deb1386fbbeb6e08 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Wed, 31 Oct 2018 08:48:42 -0700
Subject: [PATCH 22/73] Corrected indentation.

---
 tools/auto-tester/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/auto-tester/CMakeLists.txt b/tools/auto-tester/CMakeLists.txt
index 1befa6332e..c8c0a336d2 100644
--- a/tools/auto-tester/CMakeLists.txt
+++ b/tools/auto-tester/CMakeLists.txt
@@ -57,7 +57,7 @@ if (WIN32)
     )
         
     # add a custom command to copy the SSL DLLs
-     add_custom_command(
+    add_custom_command(
         TARGET ${TARGET_NAME}
         POST_BUILD
         COMMAND "${CMAKE_COMMAND}" -E copy_directory "$ENV{VCPKG_ROOT}/installed/x64-windows/bin" "$<TARGET_FILE_DIR:${TARGET_NAME}>"

From 628ec8ec2be2346865a68b595a28749484e735e1 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Wed, 31 Oct 2018 10:09:01 -0700
Subject: [PATCH 23/73] Removed QmlCommerce.cpp, Ledger.cpp changes as
 requested

---
 .../qml/hifi/commerce/purchases/Purchases.qml         | 11 ++++++++++-
 interface/src/commerce/Ledger.cpp                     | 10 +++-------
 interface/src/commerce/Ledger.h                       |  2 +-
 interface/src/commerce/QmlCommerce.cpp                |  5 +++--
 interface/src/commerce/QmlCommerce.h                  |  2 +-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 09cea01ccf..7000b632e2 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -540,8 +540,17 @@ Rectangle {
             listView: purchasesContentsList;
             getPage: function () {
                 console.debug('getPage', purchasesModel.listModelName, filterBar.primaryFilter_filterName, purchasesModel.currentPageToRetrieve, purchasesModel.itemsPerPage);
+                var editionFilter = "";
+                var primaryFilter = "";
+
+                if (filterBar.primaryFilter_filterName === "proofs") {
+                    editionFilter = "proofs";
+                } else {
+                    primaryFilter = filterBar.primaryFilter_filterName;
+                }
                 Commerce.inventory(
-                    filterBar.primaryFilter_filterName,
+                    editionFilter,
+                    primaryFilter,
                     filterBar.text,
                     purchasesModel.currentPageToRetrieve,
                     purchasesModel.itemsPerPage
diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 9703f7377f..f4bd7a84b3 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -152,14 +152,10 @@ void Ledger::balance(const QStringList& keys) {
     keysQuery("balance", "balanceSuccess", "balanceFailure");
 }
 
-void Ledger::inventory(const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
+void Ledger::inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage) {
     QJsonObject params;
-    if (typeFilter == "proofs") {
-        params["edition_filter"] = "proofs";
-    } else {
-        params["type_filter"] = typeFilter;
-    }
-
+    params["edition_filter"] = editionFilter;
+    params["type_filter"] = typeFilter;
     params["title_filter"] = titleFilter;
     params["page"] = page;
     params["per_page"] = perPage;
diff --git a/interface/src/commerce/Ledger.h b/interface/src/commerce/Ledger.h
index 7bff9abe9b..427395ee11 100644
--- a/interface/src/commerce/Ledger.h
+++ b/interface/src/commerce/Ledger.h
@@ -29,7 +29,7 @@ public:
     bool receiveAt(const QString& hfc_key, const QString& signing_key, const QByteArray& locker);
     bool receiveAt();
     void balance(const QStringList& keys);
-    void inventory(const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
+    void inventory(const QString& editionFilter, const QString& typeFilter, const QString& titleFilter, const int& page, const int& perPage);
     void history(const QStringList& keys, const int& pageNumber, const int& itemsPerPage);
     void account();
     void updateLocation(const QString& asset_id, const QString& location, const bool& alsoUpdateSiblings = false, const bool controlledFailure = false);
diff --git a/interface/src/commerce/QmlCommerce.cpp b/interface/src/commerce/QmlCommerce.cpp
index 369b03d610..ffe89ffc5b 100644
--- a/interface/src/commerce/QmlCommerce.cpp
+++ b/interface/src/commerce/QmlCommerce.cpp
@@ -151,7 +151,8 @@ void QmlCommerce::balance() {
     }
 }
 
-void QmlCommerce::inventory(const QString& typeFilter,
+void QmlCommerce::inventory(const QString& editionFilter,
+                            const QString& typeFilter,
                             const QString& titleFilter,
                             const int& page,
                             const int& perPage) {
@@ -159,7 +160,7 @@ void QmlCommerce::inventory(const QString& typeFilter,
     auto wallet = DependencyManager::get<Wallet>();
     QStringList cachedPublicKeys = wallet->listPublicKeys();
     if (!cachedPublicKeys.isEmpty()) {
-        ledger->inventory(typeFilter, titleFilter, page, perPage);
+        ledger->inventory(editionFilter, typeFilter, titleFilter, page, perPage);
     }
 }
 
diff --git a/interface/src/commerce/QmlCommerce.h b/interface/src/commerce/QmlCommerce.h
index a8eb45261d..2e3c0ec24d 100644
--- a/interface/src/commerce/QmlCommerce.h
+++ b/interface/src/commerce/QmlCommerce.h
@@ -74,7 +74,7 @@ protected:
 
     Q_INVOKABLE void buy(const QString& assetId, int cost, const bool controlledFailure = false);
     Q_INVOKABLE void balance();
-    Q_INVOKABLE void inventory(const QString& typeFilter = QString(), const QString& titleFilter = QString(), const int& page = 1, const int& perPage = 20);
+    Q_INVOKABLE void inventory(const QString& editionFilter = QString(), const QString& typeFilter = QString(), const QString& titleFilter = QString(), const int& page = 1, const int& perPage = 20);
     Q_INVOKABLE void history(const int& pageNumber, const int& itemsPerPage = 100);
     Q_INVOKABLE void generateKeyPair();
     Q_INVOKABLE void account();

From b5a48d31b6e92d1500a77b88b048d9a01991cfac Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Wed, 31 Oct 2018 10:18:04 -0700
Subject: [PATCH 24/73] Fix code-review spacing issue

---
 interface/resources/qml/controls-uit/FilterBar.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controls-uit/FilterBar.qml
index 71aa1f64ab..3d4e18ed48 100644
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controls-uit/FilterBar.qml
@@ -261,7 +261,7 @@ Item {
             anchors.fill: parent;
             model: filterBarModel;
             delegate: Item {
-                width:   parent.width;
+                width: parent.width;
                 height: 50;
                 Rectangle {
                     id: dropDownButton;

From 8633dc0f663129728423997908347430b7bd4910 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 31 Oct 2018 12:34:20 -0700
Subject: [PATCH 25/73] disable interstitial on android

---
 libraries/networking/src/DomainHandler.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/DomainHandler.h b/libraries/networking/src/DomainHandler.h
index ddd23339df..c0c5a4d059 100644
--- a/libraries/networking/src/DomainHandler.h
+++ b/libraries/networking/src/DomainHandler.h
@@ -231,7 +231,11 @@ private:
     QString _pendingPath;
     QTimer _settingsTimer;
     mutable ReadWriteLockable _interstitialModeSettingLock;
-    Setting::Handle<bool> _enableInterstitialMode{ "enableInterstitialMode", true };
+#ifdef Q_OS_ANDROID
+    Setting::Handle<bool> _enableInterstitialMode{ "enableInterstitialMode", false };
+#else
+    Setting::Handle<bool> _enableInterstitialMode { "enableInterstitialMode", true };
+#endif
 
     QSet<QString> _domainConnectionRefusals;
     bool _hasCheckedForAccessToken { false };

From 448be8847ff82b62232b2521a3ce035949d8f32b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 13:23:58 -0700
Subject: [PATCH 26/73] Notifications are working!

---
 .../qml/hifi/commerce/purchases/Purchases.qml |   1 -
 .../qml/hifi/commerce/wallet/Wallet.qml       |  26 +++-
 scripts/modules/appUi.js                      | 144 +++++++++++-------
 scripts/modules/request.js                    |   5 +-
 scripts/system/commerce/wallet.js             |  46 +++---
 scripts/system/pal.js                         |  16 +-
 scripts/system/tablet-goto.js                 |  16 +-
 7 files changed, 155 insertions(+), 99 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index eeb98eeb8c..3f77a17ac0 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -91,7 +91,6 @@ Rectangle {
             if (result.status !== 'success') {
                 console.log("Failed to get Available Updates", result.data.message);
             } else {
-                sendToScript({method: 'purchases_availableUpdatesReceived', numUpdates: result.data.updates.length });
                 root.numUpdatesAvailable = result.total_entries;
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index a958e62aad..e1e58bf7c7 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -99,6 +99,13 @@ Rectangle {
         }
     }
 
+    onActiveViewChanged: {
+        if (activeView === "walletHome") {
+            walletHomeButtonContainer.messagesWaiting = false;
+            sendToScript({method: 'clearShouldShowDotHistory'});
+        }
+    }
+
     HifiCommerceCommon.CommerceLightbox {
         id: lightboxPopup;
         visible: false;
@@ -494,6 +501,7 @@ Rectangle {
         // "WALLET HOME" tab button
         Rectangle {
             id: walletHomeButtonContainer;
+            property bool messagesWaiting: false;
             visible: !walletSetup.visible;
             color: root.activeView === "walletHome" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
@@ -514,6 +522,19 @@ Rectangle {
                 color: WalletScriptingInterface.limitedCommerce ? hifi.colors.lightGray50 : ((root.activeView === "walletHome" || walletHomeTabMouseArea.containsMouse) ? hifi.colors.white : hifi.colors.blueHighlight);
             }
 
+            Rectangle {
+                id: recentActivityMessagesWaitingLight;
+                visible: parent.messagesWaiting;
+                anchors.right: homeTabIcon.left;
+                anchors.rightMargin: -4;
+                anchors.top: homeTabIcon.top;
+                anchors.topMargin: 16;
+                height: 10;
+                width: height;
+                radius: height/2;
+                color: "red";
+            }
+
             RalewaySemiBold {
                 text: "RECENT ACTIVITY";
                 // Text size
@@ -572,7 +593,7 @@ Rectangle {
             }
 
             Rectangle {
-                id: messagesWaitingLight;
+                id: exchangeMoneyMessagesWaitingLight;
                 visible: parent.messagesWaiting;
                 anchors.right: exchangeMoneyTabIcon.left;
                 anchors.rightMargin: -4;
@@ -889,6 +910,9 @@ Rectangle {
             case 'updateWearables':
                 walletInventory.fromScript(message);
             break;
+            case 'updateRecentActivityMessageLight':
+                walletHomeButtonContainer.messagesWaiting = message.messagesWaiting;
+            break;
             default:
                 console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
         }
diff --git a/scripts/modules/appUi.js b/scripts/modules/appUi.js
index efb842a9bb..c340dfecd2 100644
--- a/scripts/modules/appUi.js
+++ b/scripts/modules/appUi.js
@@ -95,16 +95,16 @@ function AppUi(properties) {
             activeIcon: isWaiting ? that.activeMessagesButton : that.activeButton
         });
     };
-    that.notificationPollTimeout = false;
-    that.notificationPollTimeoutMs = 60000;
-    that.notificationPollEndpoint = false;
-    that.notificationPollStopPaginatingConditionMet = false;
+    that.notificationPollTimeout = [false];
+    that.notificationPollTimeoutMs = [60000];
+    that.notificationPollEndpoint = [false];
+    that.notificationPollStopPaginatingConditionMet = [false];
     that.notificationDataProcessPage = function (data) {
         return data;
     };
-    that.notificationPollCallback = that.ignore;
-    that.notificationPollCaresAboutSince = false;
-    that.notificationInitialCallbackMade = false;
+    that.notificationPollCallback = [that.ignore];
+    that.notificationPollCaresAboutSince = [false];
+    that.notificationInitialCallbackMade = [false];
     that.notificationDisplayBanner = function (message) {
         if (!that.isOpen) {
             Window.displayAnnouncement(message);
@@ -149,73 +149,105 @@ function AppUi(properties) {
     //
     // START Notification Handling
     //
+
+    var currentDataPageToRetrieve = [];
+    var concatenatedServerResponse = [];
+    for (var i = 0; i < that.notificationPollEndpoint.length; i++) {
+        currentDataPageToRetrieve[i] = 1;
+        concatenatedServerResponse[i] = new Array();
+    }
+
+    function requestCallback(error, response, optionalParams) {
+        var indexOfRequest = optionalParams.indexOfRequest;
+        var urlOfRequest = optionalParams.urlOfRequest;
+
+        if (error || (response.status !== 'success')) {
+            print("Error: unable to get", urlOfRequest, error || response.status);
+            that.notificationPollTimeout[indexOfRequest] = Script.setTimeout(
+                that.notificationPoll(indexOfRequest), that.notificationPollTimeoutMs[indexOfRequest]);
+            return;
+        }
+
+        if (!that.notificationPollStopPaginatingConditionMet[indexOfRequest] ||
+            that.notificationPollStopPaginatingConditionMet[indexOfRequest](response)) {
+            that.notificationPollTimeout[indexOfRequest] = Script.setTimeout(function () {
+                that.notificationPoll(indexOfRequest);
+            }, that.notificationPollTimeoutMs[indexOfRequest]);
+
+            var notificationData;
+            if (concatenatedServerResponse[indexOfRequest].length) {
+                notificationData = concatenatedServerResponse[indexOfRequest];
+            } else {
+                notificationData = that.notificationDataProcessPage[indexOfRequest](response);
+            }
+            console.debug(that.buttonName, that.notificationPollEndpoint[indexOfRequest],
+                'notification data for processing:', JSON.stringify(notificationData));
+            that.notificationPollCallback[indexOfRequest](notificationData);
+            that.notificationInitialCallbackMade[indexOfRequest] = true;
+            currentDataPageToRetrieve[indexOfRequest] = 1;
+            concatenatedServerResponse[indexOfRequest] = new Array();
+        } else {
+            concatenatedServerResponse[indexOfRequest] =
+                concatenatedServerResponse[indexOfRequest].concat(that.notificationDataProcessPage[indexOfRequest](response));
+            currentDataPageToRetrieve[indexOfRequest]++;
+            request({
+                json: true,
+                uri: (urlOfRequest + "&page=" + currentDataPageToRetrieve[indexOfRequest])
+            }, requestCallback, optionalParams);
+        }
+    }
+
+
     var METAVERSE_BASE = Account.metaverseServerURL;
-    var currentDataPageToRetrieve = 1;
-    var concatenatedServerResponse = new Array();
-    that.notificationPoll = function () {
-        if (!that.notificationPollEndpoint) {
+    that.notificationPoll = function (i) {
+        if (!that.notificationPollEndpoint[i]) {
             return;
         }
 
         // User is "appearing offline" or is offline
         if (GlobalServices.findableBy === "none" || Account.username === "") {
-            that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
+            that.notificationPollTimeout[i] = Script.setTimeout(
+                that.notificationPoll(i), that.notificationPollTimeoutMs[i]);
             return;
         }
 
-        var url = METAVERSE_BASE + that.notificationPollEndpoint;
+        var url = METAVERSE_BASE + that.notificationPollEndpoint[i];
 
-        var settingsKey = "notifications/" + that.buttonName + "/lastPoll";
+        var settingsKey = "notifications/" + that.notificationPollEndpoint[i] + "/lastPoll";
         var currentTimestamp = new Date().getTime();
         var lastPollTimestamp = Settings.getValue(settingsKey, currentTimestamp);
-        if (that.notificationPollCaresAboutSince) {
-            url = url + "&since=" + lastPollTimestamp/1000;
+        if (that.notificationPollCaresAboutSince[i]) {
+            url = url + "&since=" + lastPollTimestamp / 1000;
         }
         Settings.setValue(settingsKey, currentTimestamp);
 
         console.debug(that.buttonName, 'polling for notifications at endpoint', url);
 
-        function requestCallback(error, response) {
-            if (error || (response.status !== 'success')) {
-                print("Error: unable to get", url, error || response.status);
-                that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
-                return;
-            }
-
-            if (!that.notificationPollStopPaginatingConditionMet || that.notificationPollStopPaginatingConditionMet(response)) {
-                that.notificationPollTimeout = Script.setTimeout(that.notificationPoll, that.notificationPollTimeoutMs);
-
-                var notificationData;
-                if (concatenatedServerResponse.length) {
-                    notificationData = concatenatedServerResponse;
-                } else {
-                    notificationData = that.notificationDataProcessPage(response);
-                }
-                console.debug(that.buttonName, 'notification data for processing:', JSON.stringify(notificationData));
-                that.notificationPollCallback(notificationData);
-                that.notificationInitialCallbackMade = true;
-                currentDataPageToRetrieve = 1;
-                concatenatedServerResponse = new Array();
-            } else {
-                concatenatedServerResponse = concatenatedServerResponse.concat(that.notificationDataProcessPage(response));
-                currentDataPageToRetrieve++;
-                request({ json: true, uri: (url + "&page=" + currentDataPageToRetrieve) }, requestCallback);
-            }
-        }
-
-        request({ json: true, uri: url }, requestCallback);
+        request({
+            json: true,
+            uri: url
+        },
+        requestCallback,
+        {
+            indexOfRequest: i,
+            urlOfRequest: url
+        });
     };
 
     // This won't do anything if there isn't a notification endpoint set
-    that.notificationPoll();
+    for (i = 0; i < that.notificationPollEndpoint.length; i++) {
+        that.notificationPoll(i);
+    }
 
     function restartNotificationPoll() {
-        that.notificationInitialCallbackMade = false;
-        if (that.notificationPollTimeout) {
-            Script.clearTimeout(that.notificationPollTimeout);
-            that.notificationPollTimeout = false;
+        for (var j = 0; j < that.notificationPollEndpoint.length; j++) {
+            that.notificationInitialCallbackMade[j] = false;
+            if (that.notificationPollTimeout[j]) {
+                Script.clearTimeout(that.notificationPollTimeout[j]);
+                that.notificationPollTimeout[j] = false;
+            }
+            that.notificationPoll(j);
         }
-        that.notificationPoll();
     }
     //
     // END Notification Handling
@@ -322,9 +354,11 @@ function AppUi(properties) {
             }
             that.tablet.removeButton(that.button);
         }
-        if (that.notificationPollTimeout) {
-            Script.clearInterval(that.notificationPollTimeout);
-            that.notificationPollTimeout = false;
+        for (var i = 0; i < that.notificationPollTimeout.length; i++) {
+            if (that.notificationPollTimeout[i]) {
+                Script.clearInterval(that.notificationPollTimeout[i]);
+                that.notificationPollTimeout[i] = false;
+            }
         }
     };
     // Set up the handlers.
@@ -333,7 +367,7 @@ function AppUi(properties) {
     Script.scriptEnding.connect(that.onScriptEnding);
     GlobalServices.findableByChanged.connect(restartNotificationPoll);
     GlobalServices.myUsernameChanged.connect(restartNotificationPoll);
-    if (that.buttonName == Settings.getValue("startUpApp")) {
+    if (that.buttonName === Settings.getValue("startUpApp")) {
         Settings.setValue("startUpApp", "");
         Script.setTimeout(function () {
             that.open();
diff --git a/scripts/modules/request.js b/scripts/modules/request.js
index d0037f9b43..37f3ac0d7b 100644
--- a/scripts/modules/request.js
+++ b/scripts/modules/request.js
@@ -18,7 +18,8 @@
 module.exports = {
 
     // ------------------------------------------------------------------
-    request: function (options, callback) { // cb(error, responseOfCorrectContentType) of url. A subset of npm request.
+    // cb(error, responseOfCorrectContentType, optionalCallbackParameter) of url. A subset of npm request.
+    request: function (options, callback, optionalCallbackParameter) {
         var httpRequest = new XMLHttpRequest(), key;
         // QT bug: apparently doesn't handle onload. Workaround using readyState.
         httpRequest.onreadystatechange = function () {
@@ -38,7 +39,7 @@ module.exports = {
                 if (error) {
                     response = { statusCode: httpRequest.status };
                 }
-                callback(error, response);
+                callback(error, response, optionalCallbackParameter);
             }
         };
         if (typeof options === 'string') {
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 353145035e..5396014866 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -506,10 +506,6 @@ function fromQml(message) {
 
         ui.tablet.sendToQml({ method: 'updateWearables', wornWearables: currentlyWornWearables });
         break;
-    case 'purchases_availableUpdatesReceived':
-        shouldShowDot = message.numUpdates > 0;
-        ui.messagesWaiting(shouldShowDot && !ui.isOpen);
-        break;
     case 'purchases_walletNotSetUp':
         ui.tablet.sendToQml({
             method: 'updateWalletReferrer',
@@ -525,6 +521,10 @@ function fromQml(message) {
             openMarketplace(itemId);
         }
         break;
+    case 'clearShouldShowDotHistory':
+        shouldShowDotHistory = false;
+        ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
+        break;
     case 'http.request':
         // Handled elsewhere, don't log.
         break;
@@ -541,8 +541,13 @@ function walletOpened() {
     triggerMapping.enable();
     triggerPressMapping.enable();
     isWired = true;
-    shouldShowDot = false;
-    ui.messagesWaiting(shouldShowDot);
+
+    if (shouldShowDotHistory) {
+        ui.sendMessage({
+            method: 'updateRecentActivityMessageLight',
+            messagesWaiting: shouldShowDotHistory
+        });
+    }
 }
 
 function walletClosed() {
@@ -557,20 +562,20 @@ function notificationDataProcessPageHistory(data) {
     return data.data.history;
 }
 
-var shouldShowDot = false;
+var shouldShowDotUpdates = false;
 function notificationPollCallbackUpdates(updatesArray) {
-    shouldShowDot = shouldShowDot || updatesArray.length > 0;
-    ui.messagesWaiting(shouldShowDot && !ui.isOpen);
+    shouldShowDotUpdates = shouldShowDotUpdates || updatesArray.length > 0;
+    ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
 
     if (updatesArray.length > 0) {
         var message;
-        if (!ui.notificationInitialCallbackMade) {
+        if (!ui.notificationInitialCallbackMade[0]) {
             message = updatesArray.length + " of your purchased items " +
                 (updatesArray.length === 1 ? "has an update " : "have updates ") +
                 "available. Open WALLET to update.";
             ui.notificationDisplayBanner(message);
 
-            ui.notificationPollCaresAboutSince = true;
+            ui.notificationPollCaresAboutSince[0] = true;
         } else {
             for (var i = 0; i < updatesArray.length; i++) {
                 message = "Update available for \"" +
@@ -581,15 +586,16 @@ function notificationPollCallbackUpdates(updatesArray) {
         }
     }
 }
+var shouldShowDotHistory = false;
 function notificationPollCallbackHistory(historyArray) {
     if (!ui.isOpen) {
         var notificationCount = historyArray.length;
-        shouldShowDot = shouldShowDot || notificationCount > 0;
-        ui.messagesWaiting(shouldShowDot);
+        shouldShowDotHistory = shouldShowDotHistory || notificationCount > 0;
+        ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
 
         if (notificationCount > 0) {
             var message;
-            if (!ui.notificationInitialCallbackMade) {
+            if (!ui.notificationInitialCallbackMade[1]) {
                 message = "You have " + notificationCount + " unread wallet " +
                     "transaction" + (notificationCount === 1 ? "" : "s") + ". Open WALLET to see all activity.";
                 ui.notificationDisplayBanner(message);
@@ -605,8 +611,8 @@ function notificationPollCallbackHistory(historyArray) {
 }
 
 function isReturnedDataEmptyUpdates(data) {
-    var historyArray = data.data.history;
-    return historyArray.length === 0;
+    var updatesArray = data.data.updates;
+    return updatesArray.length === 0;
 }
 
 function isReturnedDataEmptyHistory(data) {
@@ -657,20 +663,12 @@ function startup() {
         onOpened: walletOpened,
         onClosed: walletClosed,
         onMessage: fromQml,
-/* Gotta re-add all this stuff once I get it working
         notificationPollEndpoint: ["/api/v1/commerce/available_updates?per_page=10", "/api/v1/commerce/history?per_page=10"],
         notificationPollTimeoutMs: [NOTIFICATION_POLL_TIMEOUT, NOTIFICATION_POLL_TIMEOUT],
         notificationDataProcessPage: [notificationDataProcessPageUpdates, notificationDataProcessPageHistory],
         notificationPollCallback: [notificationPollCallbackUpdates, notificationPollCallbackHistory],
         notificationPollStopPaginatingConditionMet: [isReturnedDataEmptyUpdates, isReturnedDataEmptyHistory],
         notificationPollCaresAboutSince: [false, true]
-*/
-        notificationPollEndpoint: "/api/v1/commerce/available_updates?per_page=10",
-        notificationPollTimeoutMs: 300000,
-        notificationDataProcessPage: notificationDataProcessPageUpdates,
-        notificationPollCallback: notificationPollCallbackUpdates,
-        notificationPollStopPaginatingConditionMet: isReturnedDataEmptyUpdates,
-        notificationPollCaresAboutSince: false
     });
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     installMarketplaceItemTester();
diff --git a/scripts/system/pal.js b/scripts/system/pal.js
index a2ebae1a33..341ce9ebc8 100644
--- a/scripts/system/pal.js
+++ b/scripts/system/pal.js
@@ -844,7 +844,7 @@ function notificationPollCallback(connectionsArray) {
         newOnlineUsers++;
         storedOnlineUsers[user.username] = user;
 
-        if (!ui.isOpen && ui.notificationInitialCallbackMade) {
+        if (!ui.isOpen && ui.notificationInitialCallbackMade[0]) {
             message = user.username + " is available in " +
                 user.location.root.name + ". Open PEOPLE to join them.";
             ui.notificationDisplayBanner(message);
@@ -868,7 +868,7 @@ function notificationPollCallback(connectionsArray) {
             shouldShowDot: shouldShowDot
         });
 
-        if (newOnlineUsers > 0 && !ui.notificationInitialCallbackMade) {
+        if (newOnlineUsers > 0 && !ui.notificationInitialCallbackMade[0]) {
             message = newOnlineUsers + " of your connections " +
                 (newOnlineUsers === 1 ? "is" : "are") + " available online. Open PEOPLE to join them.";
             ui.notificationDisplayBanner(message);
@@ -889,12 +889,12 @@ function startup() {
         onOpened: palOpened,
         onClosed: off,
         onMessage: fromQml,
-        notificationPollEndpoint: "/api/v1/users?filter=connections&status=online&per_page=10",
-        notificationPollTimeoutMs: 60000,
-        notificationDataProcessPage: notificationDataProcessPage,
-        notificationPollCallback: notificationPollCallback,
-        notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        notificationPollCaresAboutSince: false
+        notificationPollEndpoint: ["/api/v1/users?filter=connections&status=online&per_page=10"],
+        notificationPollTimeoutMs: [60000],
+        notificationDataProcessPage: [notificationDataProcessPage],
+        notificationPollCallback: [notificationPollCallback],
+        notificationPollStopPaginatingConditionMet: [isReturnedDataEmpty],
+        notificationPollCaresAboutSince: [false]
     });
     Window.domainChanged.connect(clearLocalQMLDataAndClosePAL);
     Window.domainConnectionRefused.connect(clearLocalQMLDataAndClosePAL);
diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js
index 6d8ba3a927..94117fd9ea 100644
--- a/scripts/system/tablet-goto.js
+++ b/scripts/system/tablet-goto.js
@@ -37,7 +37,7 @@ function notificationPollCallback(userStoriesArray) {
     //
     pingPong = !pingPong;
     var totalNewStories = 0;
-    var shouldNotifyIndividually = !ui.isOpen && ui.notificationInitialCallbackMade;
+    var shouldNotifyIndividually = !ui.isOpen && ui.notificationInitialCallbackMade[0];
     userStoriesArray.forEach(function (story) {
         if (story.audience !== "for_connections" &&
             story.audience !== "for_feed") {
@@ -91,7 +91,7 @@ function notificationPollCallback(userStoriesArray) {
     shouldShowDot = totalNewStories > 0 || (totalStories > 0 && shouldShowDot);
     ui.messagesWaiting(shouldShowDot && !ui.isOpen);
 
-    if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade) {
+    if (totalStories > 0 && !ui.isOpen && !ui.notificationInitialCallbackMade[0]) {
         message = "There " + (totalStories === 1 ? "is " : "are ") + totalStories + " event" +
             (totalStories === 1 ? "" : "s") + " to know about. " +
             "Open GOTO to see " + (totalStories === 1 ? "it" : "them") + ".";
@@ -122,12 +122,12 @@ function startup() {
         sortOrder: 8,
         onOpened: gotoOpened,
         home: GOTO_QML_SOURCE,
-        notificationPollEndpoint: endpoint,
-        notificationPollTimeoutMs: 60000,
-        notificationDataProcessPage: notificationDataProcessPage,
-        notificationPollCallback: notificationPollCallback,
-        notificationPollStopPaginatingConditionMet: isReturnedDataEmpty,
-        notificationPollCaresAboutSince: false
+        notificationPollEndpoint: [endpoint],
+        notificationPollTimeoutMs: [60000],
+        notificationDataProcessPage: [notificationDataProcessPage],
+        notificationPollCallback: [notificationPollCallback],
+        notificationPollStopPaginatingConditionMet: [isReturnedDataEmpty],
+        notificationPollCaresAboutSince: [false]
     });
 }
 

From c4c4d2c98deebd8f5f5165e1a972997476f8a9de Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 31 Oct 2018 13:07:48 -0700
Subject: [PATCH 27/73] possibly fix mac issues

---
 libraries/gpu/src/gpu/MipGeneration.slh              | 2 +-
 libraries/render-utils/src/debug_deferred_buffer.slf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/gpu/src/gpu/MipGeneration.slh b/libraries/gpu/src/gpu/MipGeneration.slh
index bc8dd39042..b5d4ab3303 100644
--- a/libraries/gpu/src/gpu/MipGeneration.slh
+++ b/libraries/gpu/src/gpu/MipGeneration.slh
@@ -13,7 +13,7 @@
 
 <@include gpu/ShaderConstants.h@>
 
-layout(binding=GPU_TEXTURE_MIP_CREATION_INPUT) uniform sampler2D texMap;
+LAYOUT(binding=GPU_TEXTURE_MIP_CREATION_INPUT) uniform sampler2D texMap;
 
 in vec2 varTexCoord0;
 
diff --git a/libraries/render-utils/src/debug_deferred_buffer.slf b/libraries/render-utils/src/debug_deferred_buffer.slf
index c6e3c49e54..ccbe5c491f 100644
--- a/libraries/render-utils/src/debug_deferred_buffer.slf
+++ b/libraries/render-utils/src/debug_deferred_buffer.slf
@@ -25,7 +25,7 @@ LAYOUT(binding=RENDER_UTILS_TEXTURE_SHADOW) uniform sampler2DArrayShadow shadowM
 
 <@include debug_deferred_buffer_shared.slh@>
 
-layout(std140, binding=RENDER_UTILS_BUFFER_DEBUG_DEFERRED_PARAMS) uniform parametersBuffer {
+LAYOUT_STD140(binding=RENDER_UTILS_BUFFER_DEBUG_DEFERRED_PARAMS) uniform parametersBuffer {
     DebugParameters parameters;
 };
 

From a1276ba8995dc91ada1f25e491c11207958e5702 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 13:31:29 -0700
Subject: [PATCH 28/73] Don't poll for history notifs if limitedCommerce is
 true

---
 scripts/system/commerce/wallet.js | 28 ++++++++++++++++++++++------
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 5396014866..2ae30b5b35 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -655,6 +655,22 @@ var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
 var NOTIFICATION_POLL_TIMEOUT = 300000;
 var ui;
 function startup() {
+    var notificationPollEndpointArray = ["/api/v1/commerce/available_updates?per_page=10"];
+    var notificationPollTimeoutMsArray = [NOTIFICATION_POLL_TIMEOUT];
+    var notificationDataProcessPageArray = [notificationDataProcessPageUpdates];
+    var notificationPollCallbackArray = [notificationPollCallbackUpdates];
+    var notificationPollStopPaginatingConditionMetArray = [isReturnedDataEmptyUpdates];
+    var notificationPollCaresAboutSinceArray = [false];
+
+    if (!WalletScriptingInterface.limitedCommerce) {
+        notificationPollEndpointArray[1] = "/api/v1/commerce/history?per_page=10";
+        notificationPollTimeoutMsArray[1] = NOTIFICATION_POLL_TIMEOUT;
+        notificationDataProcessPageArray[1] = notificationDataProcessPageHistory;
+        notificationPollCallbackArray[1] = notificationPollCallbackHistory;
+        notificationPollStopPaginatingConditionMetArray[1] = isReturnedDataEmptyHistory;
+        notificationPollCaresAboutSinceArray[1] = true;
+    }
+
     ui = new AppUi({
         buttonName: BUTTON_NAME,
         buttonPrefix: "wallet-",
@@ -663,12 +679,12 @@ function startup() {
         onOpened: walletOpened,
         onClosed: walletClosed,
         onMessage: fromQml,
-        notificationPollEndpoint: ["/api/v1/commerce/available_updates?per_page=10", "/api/v1/commerce/history?per_page=10"],
-        notificationPollTimeoutMs: [NOTIFICATION_POLL_TIMEOUT, NOTIFICATION_POLL_TIMEOUT],
-        notificationDataProcessPage: [notificationDataProcessPageUpdates, notificationDataProcessPageHistory],
-        notificationPollCallback: [notificationPollCallbackUpdates, notificationPollCallbackHistory],
-        notificationPollStopPaginatingConditionMet: [isReturnedDataEmptyUpdates, isReturnedDataEmptyHistory],
-        notificationPollCaresAboutSince: [false, true]
+        notificationPollEndpoint: notificationPollEndpointArray,
+        notificationPollTimeoutMs: notificationPollTimeoutMsArray,
+        notificationDataProcessPage: notificationDataProcessPageArray,
+        notificationPollCallback: notificationPollCallbackArray,
+        notificationPollStopPaginatingConditionMet: notificationPollStopPaginatingConditionMetArray,
+        notificationPollCaresAboutSince: notificationPollCaresAboutSinceArray
     });
     GlobalServices.myUsernameChanged.connect(onUsernameChanged);
     installMarketplaceItemTester();

From 34fb849536daa4a3a30d0a387946e114e9aea526 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 13:53:18 -0700
Subject: [PATCH 29/73] Cleanup FIXME

---
 .../qml/hifi/commerce/purchases/Purchases.qml  |  2 +-
 scripts/system/html/js/marketplacesInject.js   | 18 +-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 108a57d1f5..41453c9790 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -161,7 +161,7 @@ Rectangle {
         id: titleBarContainer;
         z: 997;
         visible: false;
-        height: 100; // HRS FIXME: get rid of the header and associated code entirely?
+        height: 100;
         // Size
         width: parent.width;
         // Anchors
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index fd228e2596..eda37c06b7 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -251,7 +251,6 @@
             }
             cost = $(this).closest('.col-xs-3').find('.item-cost').text();
             var costInt = parseInt(cost, 10);
-            var disable = limitedCommerce && (costInt > 0);
 
             $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
             $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
@@ -260,23 +259,11 @@
             priceElement.css({
                 "padding": "3px 5px",
                 "height": "40px",
-                "background": disable ? "grey" : "linear-gradient(#00b4ef, #0093C5)",
+                "background": "linear-gradient(#00b4ef, #0093C5)",
                 "color": "#FFF",
                 "font-weight": "600",
                 "line-height": "34px"
             });
-
-            if (parseInt(cost) > 0) {
-                if (disable) {
-                    priceElement.html('N/A'); // In case the following fails
-                    $(this).parent().parent().parent().parent().parent().css({"display": "none"}); // HRS FIXME, oh and do I have to set display non-none in the other branch?
-                } else {
-                    priceElement.css({ "width": "auto" });
-                    priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
-                                      'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
-                    priceElement.css({ "min-width": priceElement.width() + 30 });
-                }
-            }
         });
 
         // change pricing to GET/BUY on button hover
@@ -395,9 +382,6 @@
                 var cost = $('.item-cost').text();
                 var costInt = parseInt(cost, 10);
                 var availability = $.trim($('.item-availability').text());
-                if (limitedCommerce && (costInt > 0)) {
-                    availability = '';
-                }
                 if (availability === 'available') {
                     purchaseButton.css({
                         "background": "linear-gradient(#00b4ef, #0093C5)",

From ce0ad48a28de45c9bba040fb94eb5675a27223a0 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Wed, 31 Oct 2018 13:58:26 -0700
Subject: [PATCH 30/73] tabless wallet

---
 .../resources/qml/hifi/commerce/purchases/Purchases.qml   | 2 +-
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml   | 8 ++++----
 scripts/system/commerce/wallet.js                         | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 7000b632e2..d9ece98a84 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -452,7 +452,7 @@ Rectangle {
                 anchors.left: parent.left;
                 anchors.leftMargin: 16;
                 width: paintedWidth;
-                text: "Inventory";
+                text: "Items";
                 color: hifi.colors.black;
                 size: 22;
             }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index a958e62aad..d63b9c722e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -135,7 +135,7 @@ Rectangle {
         // Title Bar text
         RalewaySemiBold {
             id: titleBarText;
-            text: "ASSETS";
+            text: "INVENTORY";
             // Text size
             size: hifi.fontSizes.overlayTitle;
             // Anchors
@@ -376,7 +376,7 @@ Rectangle {
         id: walletInventory;
         visible: root.activeView === "walletInventory";
         anchors.top: titleBarContainer.bottom;
-        anchors.bottom: tabButtonsContainer.top;
+        anchors.bottom: !WalletScriptingInterface.limitedCommerce ? tabButtonsContainer.top : parent.bottom;
         anchors.left: parent.left;
         anchors.right: parent.right;
         Connections {
@@ -475,7 +475,7 @@ Rectangle {
     //
     Item {
         id: tabButtonsContainer;
-        visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep";
+        visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep" && !WalletScriptingInterface.limitedCommerce;
         property int numTabs: 5;
         // Size
         width: root.width;
@@ -585,7 +585,7 @@ Rectangle {
             }
 
             RalewaySemiBold {
-                text: "INVENTORY";
+                text: "ITEMS";
                 // Text size
                 size: 16;
                 // Anchors
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 353145035e..a8eca5f60d 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -644,14 +644,13 @@ function uninstallMarketplaceItemTester() {
     }
 }
 
-var BUTTON_NAME = "ASSETS";
+var BUTTON_NAME = "INVENTORY";
 var WALLET_QML_SOURCE = "hifi/commerce/wallet/Wallet.qml";
 var NOTIFICATION_POLL_TIMEOUT = 300000;
 var ui;
 function startup() {
     ui = new AppUi({
         buttonName: BUTTON_NAME,
-        buttonPrefix: "wallet-",
         sortOrder: 10,
         home: WALLET_QML_SOURCE,
         onOpened: walletOpened,

From 0b7ddca5f66058e5df4fe7d356362f1358dcfcc7 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 31 Oct 2018 14:03:20 -0700
Subject: [PATCH 31/73] Change naming for straggler names in model loading
 debug dumps

---
 libraries/fbx/src/GLTFReader.cpp | 60 ++++++++++++++++----------------
 libraries/fbx/src/GLTFReader.h   |  2 +-
 libraries/fbx/src/OBJReader.cpp  | 18 +++++-----
 libraries/fbx/src/OBJReader.h    |  2 +-
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp
index 05534b5264..7ee13c5cdf 100644
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@@ -929,7 +929,7 @@ HFMGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping
 
     buildGeometry(geometry, url);
     
-    //fbxDebugDump(geometry);
+    //hfmDebugDump(geometry);
     return geometryPtr;
     
 }
@@ -1181,37 +1181,37 @@ void GLTFReader::retriangulate(const QVector<int>& inIndices, const QVector<glm:
     }
 }
 
-void GLTFReader::fbxDebugDump(const HFMGeometry& fbxgeo) {
+void GLTFReader::hfmDebugDump(const HFMGeometry& hfmgeo) {
     qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
 
-    qCDebug(modelformat) << "  leftEyeJointIndex =" << fbxgeo.leftEyeJointIndex;
-    qCDebug(modelformat) << "  rightEyeJointIndex =" << fbxgeo.rightEyeJointIndex;
-    qCDebug(modelformat) << "  neckJointIndex =" << fbxgeo.neckJointIndex;
-    qCDebug(modelformat) << "  rootJointIndex =" << fbxgeo.rootJointIndex;
-    qCDebug(modelformat) << "  leanJointIndex =" << fbxgeo.leanJointIndex;
-    qCDebug(modelformat) << "  headJointIndex =" << fbxgeo.headJointIndex;
-    qCDebug(modelformat) << "  leftHandJointIndex" << fbxgeo.leftHandJointIndex;
-    qCDebug(modelformat) << "  rightHandJointIndex" << fbxgeo.rightHandJointIndex;
-    qCDebug(modelformat) << "  leftToeJointIndex" << fbxgeo.leftToeJointIndex;
-    qCDebug(modelformat) << "  rightToeJointIndex" << fbxgeo.rightToeJointIndex;
-    qCDebug(modelformat) << "  leftEyeSize = " << fbxgeo.leftEyeSize;
-    qCDebug(modelformat) << "  rightEyeSize = " << fbxgeo.rightEyeSize;
+    qCDebug(modelformat) << "  leftEyeJointIndex =" << hfmgeo.leftEyeJointIndex;
+    qCDebug(modelformat) << "  rightEyeJointIndex =" << hfmgeo.rightEyeJointIndex;
+    qCDebug(modelformat) << "  neckJointIndex =" << hfmgeo.neckJointIndex;
+    qCDebug(modelformat) << "  rootJointIndex =" << hfmgeo.rootJointIndex;
+    qCDebug(modelformat) << "  leanJointIndex =" << hfmgeo.leanJointIndex;
+    qCDebug(modelformat) << "  headJointIndex =" << hfmgeo.headJointIndex;
+    qCDebug(modelformat) << "  leftHandJointIndex" << hfmgeo.leftHandJointIndex;
+    qCDebug(modelformat) << "  rightHandJointIndex" << hfmgeo.rightHandJointIndex;
+    qCDebug(modelformat) << "  leftToeJointIndex" << hfmgeo.leftToeJointIndex;
+    qCDebug(modelformat) << "  rightToeJointIndex" << hfmgeo.rightToeJointIndex;
+    qCDebug(modelformat) << "  leftEyeSize = " << hfmgeo.leftEyeSize;
+    qCDebug(modelformat) << "  rightEyeSize = " << hfmgeo.rightEyeSize;
 
-    qCDebug(modelformat) << "  palmDirection = " << fbxgeo.palmDirection;
+    qCDebug(modelformat) << "  palmDirection = " << hfmgeo.palmDirection;
 
-    qCDebug(modelformat) << "  neckPivot = " << fbxgeo.neckPivot;
+    qCDebug(modelformat) << "  neckPivot = " << hfmgeo.neckPivot;
 
-    qCDebug(modelformat) << "  bindExtents.size() = " << fbxgeo.bindExtents.size();
-    qCDebug(modelformat) << "  meshExtents.size() = " << fbxgeo.meshExtents.size();
+    qCDebug(modelformat) << "  bindExtents.size() = " << hfmgeo.bindExtents.size();
+    qCDebug(modelformat) << "  meshExtents.size() = " << hfmgeo.meshExtents.size();
 
-    qCDebug(modelformat) << "  jointIndices.size() =" << fbxgeo.jointIndices.size();
-    qCDebug(modelformat) << "  joints.count() =" << fbxgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices.size() =" << hfmgeo.jointIndices.size();
+    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
     qCDebug(modelformat) << "---------------- Meshes ----------------";
-    qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
-    qCDebug(modelformat) << "  blendshapeChannelNames = " << fbxgeo.blendshapeChannelNames;
-    foreach(HFMMesh mesh, fbxgeo.meshes) {
+    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
+    qCDebug(modelformat) << "  blendshapeChannelNames = " << hfmgeo.blendshapeChannelNames;
+    foreach(HFMMesh mesh, hfmgeo.meshes) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    meshpointer =" << mesh._mesh.get();
         qCDebug(modelformat) << "    meshindex =" << mesh.meshIndex;
@@ -1254,18 +1254,18 @@ void GLTFReader::fbxDebugDump(const HFMGeometry& fbxgeo) {
         qCDebug(modelformat) << "\n";
     }
     qCDebug(modelformat) << "---------------- AnimationFrames ----------------";
-    foreach(HFMAnimationFrame anim, fbxgeo.animationFrames) {
+    foreach(HFMAnimationFrame anim, hfmgeo.animationFrames) {
         qCDebug(modelformat) << "  anim.translations = " << anim.translations;
         qCDebug(modelformat) << "  anim.rotations = " << anim.rotations;
     }
-    QList<int> mitomona_keys = fbxgeo.meshIndicesToModelNames.keys();
+    QList<int> mitomona_keys = hfmgeo.meshIndicesToModelNames.keys();
     foreach(int key, mitomona_keys) {
-        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << fbxgeo.meshIndicesToModelNames[key];
+        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << hfmgeo.meshIndicesToModelNames[key];
     }
 
     qCDebug(modelformat) << "---------------- Materials ----------------";
 
-    foreach(HFMMaterial mat, fbxgeo.materials) {
+    foreach(HFMMaterial mat, hfmgeo.materials) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "  mat.materialID =" << mat.materialID;
         qCDebug(modelformat) << "  diffuseColor =" << mat.diffuseColor;
@@ -1314,7 +1314,7 @@ void GLTFReader::fbxDebugDump(const HFMGeometry& fbxgeo) {
 
     qCDebug(modelformat) << "---------------- Joints ----------------";
 
-    foreach(HFMJoint joint, fbxgeo.joints) {
+    foreach(HFMJoint joint, hfmgeo.joints) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    shapeInfo.avgPoint =" << joint.shapeInfo.avgPoint;
         qCDebug(modelformat) << "    shapeInfo.debugLines =" << joint.shapeInfo.debugLines;
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index b75962aa55..17229c3554 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -780,7 +780,7 @@ private:
 
     void setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material);
     HFMTexture getHFMTexture(const GLTFTexture& texture);
-    void fbxDebugDump(const HFMGeometry& fbxgeo);
+    void hfmDebugDump(const HFMGeometry& hfmgeo);
 };
 
 #endif // hifi_GLTFReader_h
\ No newline at end of file
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index ec48663307..fcfef5fe01 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -824,7 +824,7 @@ HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         // Build the single mesh.
         FBXReader::buildModelMesh(mesh, url.toString());
 
-        // fbxDebugDump(geometry);
+        // hfmDebugDump(geometry);
     } catch(const std::exception& e) {
         qCDebug(modelformat) << "OBJ reader fail: " << e.what();
     }
@@ -991,12 +991,12 @@ HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
     return geometryPtr;
 }
 
-void fbxDebugDump(const HFMGeometry& fbxgeo) {
+void hfmDebugDump(const HFMGeometry& hfmgeo) {
     qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
-    qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
-    foreach (HFMMesh mesh, fbxgeo.meshes) {
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
+    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
+    foreach (HFMMesh mesh, hfmgeo.meshes) {
         qCDebug(modelformat) << "    vertices.count() =" << mesh.vertices.count();
         qCDebug(modelformat) << "    colors.count() =" << mesh.colors.count();
         qCDebug(modelformat) << "    normals.count() =" << mesh.normals.count();
@@ -1037,10 +1037,10 @@ void fbxDebugDump(const HFMGeometry& fbxgeo) {
         }
     }
 
-    qCDebug(modelformat) << "  jointIndices =" << fbxgeo.jointIndices;
-    qCDebug(modelformat) << "  joints.count() =" << fbxgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices =" << hfmgeo.jointIndices;
+    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
 
-    foreach (HFMJoint joint, fbxgeo.joints) {
+    foreach (HFMJoint joint, hfmgeo.joints) {
         qCDebug(modelformat) << "    isFree =" << joint.isFree;
         qCDebug(modelformat) << "    freeLineage" << joint.freeLineage;
         qCDebug(modelformat) << "    parentIndex" << joint.parentIndex;
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index edfe6f23e8..2eb039eba2 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -104,4 +104,4 @@ private:
 
 // What are these utilities doing here? One is used by fbx loading code in VHACD Utils, and the other a general debugging utility.
 void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID);
-void fbxDebugDump(const HFMGeometry& fbxgeo);
+void hfmDebugDump(const HFMGeometry& hfmgeo);

From 643026abd61ed38f0907bb65da7693a13110a432 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Wed, 31 Oct 2018 14:15:30 -0700
Subject: [PATCH 32/73] Change local variable in TestFbx for clarity

---
 tests-manual/gpu/src/TestFbx.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests-manual/gpu/src/TestFbx.cpp b/tests-manual/gpu/src/TestFbx.cpp
index ba94fb810c..9890e4fbe7 100644
--- a/tests-manual/gpu/src/TestFbx.cpp
+++ b/tests-manual/gpu/src/TestFbx.cpp
@@ -100,12 +100,12 @@ bool TestFbx::isReady() const {
 
 void TestFbx::parseFbx(const QByteArray& fbxData) {
     QVariantHash mapping;
-    HFMGeometry* fbx = readFBX(fbxData, mapping);
+    HFMGeometry* geometry = readFBX(fbxData, mapping);
     size_t totalVertexCount = 0;
     size_t totalIndexCount = 0;
     size_t totalPartCount = 0;
     size_t highestIndex = 0;
-    for (const auto& mesh : fbx->meshes) {
+    for (const auto& mesh : geometry->meshes) {
         size_t vertexCount = mesh.vertices.size();
         totalVertexCount += mesh.vertices.size();
         highestIndex = std::max(highestIndex, vertexCount);
@@ -123,7 +123,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     std::vector<DrawElementsIndirectCommand> parts;
     parts.reserve(totalPartCount);
     _partCount = totalPartCount;
-    for (const auto& mesh : fbx->meshes) {
+    for (const auto& mesh : geometry->meshes) {
         baseVertex = vertices.size();
 
         vec3 color;
@@ -133,7 +133,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
             partIndirect.firstIndex = (uint)indices.size();
             partIndirect.baseInstance = (uint)parts.size();
             _partTransforms.push_back(mesh.modelTransform);
-            auto material = fbx->materials[part.materialID];
+            auto material = geometry->materials[part.materialID];
             color = material.diffuseColor;
             for (auto index : part.quadTrianglesIndices) {
                 indices.push_back(index);
@@ -163,7 +163,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     _vertexBuffer->append(vertices);
     _indexBuffer->append(indices);
     _indirectBuffer->append(parts);
-    delete fbx;
+    delete geometry;
 }
 
 void TestFbx::renderTest(size_t testId, RenderArgs* args) {

From 41a0d093896cc4c08b103a92d8473bc689f598d2 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 15:31:51 -0700
Subject: [PATCH 33/73] First pass

---
 .../qml/LoginDialog/LinkAccountBody.qml       |  14 +-
 .../hifi/commerce/common/CommerceLightbox.qml |   8 +-
 .../qml/hifi/commerce/wallet/Security.qml     | 246 --------------
 .../qml/hifi/dialogs/security/Security.qml    | 306 ++++++++++++++++++
 .../security}/SecurityImageChange.qml         |  32 +-
 .../security}/SecurityImageModel.qml          |   8 +-
 .../security}/SecurityImageSelection.qml      |  16 +-
 .../hifi/dialogs/security/SecurityWrapper.qml |  30 ++
 .../wallet => dialogs/security}/images/01.jpg | Bin
 .../wallet => dialogs/security}/images/02.jpg | Bin
 .../wallet => dialogs/security}/images/03.jpg | Bin
 .../wallet => dialogs/security}/images/04.jpg | Bin
 .../wallet => dialogs/security}/images/05.jpg | Bin
 .../wallet => dialogs/security}/images/06.jpg | Bin
 .../wallet => dialogs/security}/images/07.jpg | Bin
 .../wallet => dialogs/security}/images/08.jpg | Bin
 .../wallet => dialogs/security}/images/09.jpg | Bin
 .../wallet => dialogs/security}/images/10.jpg | Bin
 .../wallet => dialogs/security}/images/11.jpg | Bin
 .../wallet => dialogs/security}/images/12.jpg | Bin
 .../wallet => dialogs/security}/images/13.jpg | Bin
 .../wallet => dialogs/security}/images/14.jpg | Bin
 .../wallet => dialogs/security}/images/15.jpg | Bin
 .../wallet => dialogs/security}/images/16.jpg | Bin
 .../wallet => dialogs/security}/images/17.jpg | Bin
 .../wallet => dialogs/security}/images/18.jpg | Bin
 .../wallet => dialogs/security}/images/19.jpg | Bin
 .../wallet => dialogs/security}/images/20.jpg | Bin
 .../wallet => dialogs/security}/images/21.jpg | Bin
 .../wallet => dialogs/security}/images/22.jpg | Bin
 .../wallet => dialogs/security}/images/23.jpg | Bin
 .../wallet => dialogs/security}/images/24.jpg | Bin
 .../wallet => dialogs/security}/images/25.jpg | Bin
 .../wallet => dialogs/security}/images/26.jpg | Bin
 .../wallet => dialogs/security}/images/27.jpg | Bin
 .../wallet => dialogs/security}/images/28.jpg | Bin
 .../wallet => dialogs/security}/images/29.jpg | Bin
 .../wallet => dialogs/security}/images/30.jpg | Bin
 .../wallet => dialogs/security}/images/31.jpg | Bin
 .../wallet => dialogs/security}/images/32.jpg | Bin
 .../wallet => dialogs/security}/images/33.jpg | Bin
 .../wallet => dialogs/security}/images/34.jpg | Bin
 .../security}/images/lowerKeyboard.png        | Bin
 .../security}/images/wallet-bg.jpg            | Bin
 .../security}/images/wallet-tip-bg.png        | Bin
 interface/src/Application.cpp                 |  12 +-
 interface/src/Menu.cpp                        |   7 +
 scripts/system/commerce/wallet.js             |   6 +-
 48 files changed, 388 insertions(+), 297 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/commerce/wallet/Security.qml
 create mode 100644 interface/resources/qml/hifi/dialogs/security/Security.qml
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/SecurityImageChange.qml (89%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/SecurityImageModel.qml (89%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/SecurityImageSelection.qml (88%)
 create mode 100644 interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/01.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/02.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/03.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/04.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/05.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/06.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/07.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/08.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/09.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/10.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/11.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/12.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/13.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/14.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/15.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/16.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/17.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/18.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/19.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/20.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/21.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/22.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/23.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/24.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/25.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/26.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/27.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/28.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/29.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/30.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/31.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/32.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/33.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/34.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/lowerKeyboard.png (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/wallet-bg.jpg (100%)
 rename interface/resources/qml/hifi/{commerce/wallet => dialogs/security}/images/wallet-tip-bg.png (100%)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 48cf124127..d5d89cd0b4 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -136,7 +136,7 @@ Item {
 
         TextField {
             id: usernameField
-            text: Settings.getValue("wallet/savedUsername", "");
+            text: Settings.getValue("keepMeLoggedIn/savedUsername", "");
             width: parent.width
             focus: true
             placeholderText: "Username or Email"
@@ -165,7 +165,7 @@ Item {
                 root.text = "";
             }
             Component.onCompleted: {
-                var savedUsername = Settings.getValue("wallet/savedUsername", "");
+                var savedUsername = Settings.getValue("keepMeLoggedIn/savedUsername", "");
                 usernameField.text = savedUsername === "Unknown user" ? "" : savedUsername;
             }
         }
@@ -263,21 +263,21 @@ Item {
 
             CheckBox {
                 id: autoLogoutCheckbox
-                checked: !Settings.getValue("wallet/autoLogout", true)
+                checked: Settings.getValue("keepMeLoggedIn", false)
                 text: "Keep me signed in"
                 boxSize: 20;
                 labelFontSize: 15
                 color: hifi.colors.black
                 onCheckedChanged: {
-                    Settings.setValue("wallet/autoLogout", !checked);
+                    Settings.setValue("keepMeLoggedIn", checked);
                     if (checked) {
-                        Settings.setValue("wallet/savedUsername", Account.username);
+                        Settings.setValue("keepMeLoggedIn/savedUsername", Account.username);
                     } else {
-                        Settings.setValue("wallet/savedUsername", "");
+                        Settings.setValue("keepMeLoggedIn/savedUsername", "");
                     }
                 }
                 Component.onDestruction: {
-                    Settings.setValue("wallet/autoLogout", !checked);
+                    Settings.setValue("keepMeLoggedIn", checked);
                 }
             }
 
diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 9d9216c461..5ddfa98923 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -14,9 +14,9 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
-import "../../../controls" as HifiControls
+import "qrc:////qml//styles-uit"
+import "qrc:////qml//controls-uit" as HifiControlsUit
+import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
 
@@ -40,6 +40,8 @@ Rectangle {
     anchors.fill: parent;
     color: Qt.rgba(0, 0, 0, 0.5);
     z: 999;
+    
+    HifiConstants { id: hifi; }
 
     onVisibleChanged: {
         if (!visible) {
diff --git a/interface/resources/qml/hifi/commerce/wallet/Security.qml b/interface/resources/qml/hifi/commerce/wallet/Security.qml
deleted file mode 100644
index 14ac696ef7..0000000000
--- a/interface/resources/qml/hifi/commerce/wallet/Security.qml
+++ /dev/null
@@ -1,246 +0,0 @@
-//
-//  Security.qml
-//  qml/hifi/commerce/wallet
-//
-//  Security
-//
-//  Created by Zach Fox on 2017-08-18
-//  Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import Hifi 1.0 as Hifi
-import QtQuick 2.5
-import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
-import "../../../controls" as HifiControls
-
-// references XXX from root context
-
-Item {
-    HifiConstants { id: hifi; }
-
-    id: root;
-    property string keyFilePath;
-
-    Connections {
-        target: Commerce;
-
-        onKeyFilePathIfExistsResult: {
-            root.keyFilePath = path;
-        }
-    }
-
-    // Username Text
-    RalewayRegular {
-        id: usernameText;
-        text: Account.username;
-        // Text size
-        size: 24;
-        // Style
-        color: hifi.colors.white;
-        elide: Text.ElideRight;
-        // Anchors
-        anchors.top: parent.top;
-        anchors.left: parent.left;
-        anchors.leftMargin: 20;
-        width: parent.width/2;
-        height: 80;
-    }
-
-    Item {
-        id: securityContainer;
-        anchors.top: usernameText.bottom;
-        anchors.topMargin: 20;
-        anchors.left: parent.left;
-        anchors.right: parent.right;
-        anchors.bottom: parent.bottom;
-
-        RalewaySemiBold {
-            id: securityText;
-            text: "Security";
-            // Anchors
-            anchors.top: parent.top;
-            anchors.left: parent.left;
-            anchors.leftMargin: 20;
-            anchors.right: parent.right;
-            height: 30;
-            // Text size
-            size: 18;
-            // Style
-            color: hifi.colors.blueHighlight;
-        }
-
-        Rectangle {
-            id: securityTextSeparator;
-            // Size
-            width: parent.width;
-            height: 1;
-            // Anchors
-            anchors.left: parent.left;
-            anchors.right: parent.right;
-            anchors.top: securityText.bottom;
-            anchors.topMargin: 8;
-            // Style
-            color: hifi.colors.faintGray;
-        }
-
-        Item {
-            id: changeSecurityImageContainer;
-            anchors.top: securityTextSeparator.bottom;
-            anchors.topMargin: 8;
-            anchors.left: parent.left;
-            anchors.leftMargin: 40;
-            anchors.right: parent.right;
-            anchors.rightMargin: 55;
-            height: 75;
-
-            HiFiGlyphs {
-                id: changeSecurityImageImage;
-                text: hifi.glyphs.securityImage;
-                // Size
-                size: 80;
-                // Anchors
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.left: parent.left;
-                // Style
-                color: hifi.colors.white;
-            }
-
-            RalewaySemiBold {
-                text: "Security Pic";
-                // Anchors
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.left: changeSecurityImageImage.right;
-                anchors.leftMargin: 30;
-                width: 50;
-                // Text size
-                size: 18;
-                // Style
-                color: hifi.colors.white;
-            }
-
-            // "Change Security Pic" button
-            HifiControlsUit.Button {
-                id: changeSecurityImageButton;
-                color: hifi.buttons.blue;
-                colorScheme: hifi.colorSchemes.dark;
-                anchors.right: parent.right;
-                anchors.verticalCenter: parent.verticalCenter;
-                width: 140;
-                height: 40;
-                text: "Change";
-                onClicked: {
-                    sendSignalToWallet({method: 'walletSecurity_changeSecurityImage'});
-                }
-            }
-        }
-
-        Item {
-            id: autoLogoutContainer;
-            anchors.top: changeSecurityImageContainer.bottom;
-            anchors.topMargin: 8;
-            anchors.left: parent.left;
-            anchors.leftMargin: 40;
-            anchors.right: parent.right;
-            anchors.rightMargin: 55;
-            height: 75;
-
-            HiFiGlyphs {	
-                id: autoLogoutImage;	
-                text: hifi.glyphs.walletKey;	
-                // Size	
-                size: 80;	
-                // Anchors	
-                anchors.top: parent.top;	
-                anchors.topMargin: 20;	
-                anchors.left: parent.left;	
-                // Style	
-                color: hifi.colors.white;	
-            }
-
-            HifiControlsUit.CheckBox {
-                id: autoLogoutCheckbox;
-                checked: Settings.getValue("wallet/autoLogout", false);
-                text: "Automatically Log Out when Exiting Interface"
-                // Anchors
-                anchors.verticalCenter: autoLogoutImage.verticalCenter;
-                anchors.left: autoLogoutImage.right;
-                anchors.leftMargin: 20;
-                anchors.right: autoLogoutHelp.left;
-                anchors.rightMargin: 12;
-                boxSize: 28;
-                labelFontSize: 18;
-                color: hifi.colors.white;
-                onCheckedChanged: {
-                    Settings.setValue("wallet/autoLogout", checked);
-                    if (checked) {
-                        Settings.setValue("wallet/savedUsername", Account.username);
-                    } else {
-                        Settings.setValue("wallet/savedUsername", "");
-                    }
-                }
-            }
-
-            RalewaySemiBold {
-                id: autoLogoutHelp;
-                text: '[?]';
-                // Anchors
-                anchors.verticalCenter: autoLogoutImage.verticalCenter;
-                anchors.right: parent.right;
-                width: 30;
-                height: 30;
-                // Text size
-                size: 18;
-                // Style
-                color: hifi.colors.blueHighlight;
-
-                MouseArea {
-                    anchors.fill: parent;
-                    hoverEnabled: true;
-                    onEntered: {
-                        parent.color = hifi.colors.blueAccent;
-                    }
-                    onExited: {
-                        parent.color = hifi.colors.blueHighlight;
-                    }
-                    onClicked: {
-                        sendSignalToWallet({method: 'walletSecurity_autoLogoutHelp'});
-                    }
-                }
-            }
-        }
-    }
-
-    //
-    // FUNCTION DEFINITIONS START
-    //
-    //
-    // Function Name: fromScript()
-    //
-    // Relevant Variables:
-    // None
-    //
-    // Arguments:
-    // message: The message sent from the JavaScript.
-    //     Messages are in format "{method, params}", like json-rpc.
-    //
-    // Description:
-    // Called when a message is received from a script.
-    //
-    function fromScript(message) {
-        switch (message.method) {
-            default:
-                console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
-        }
-    }
-    signal sendSignalToWallet(var msg);
-    //
-    // FUNCTION DEFINITIONS END
-    //
-}
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
new file mode 100644
index 0000000000..d1dc2a9e11
--- /dev/null
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -0,0 +1,306 @@
+//
+//  Security.qml
+//  qml\hifi\dialogs\security
+//
+//  Security
+//
+//  Created by Zach Fox on 2018-10-31
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import Hifi 1.0 as Hifi
+import QtQuick 2.5
+import QtGraphicalEffects 1.0
+import "qrc:////qml//styles-uit" as HifiStylesUit
+import "qrc:////qml//controls-uit" as HifiControlsUit
+import "qrc:////qml//controls" as HifiControls
+import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon
+
+// references XXX from root context
+
+Rectangle {
+    HifiStylesUit.HifiConstants { id: hifi; }
+
+    id: root;
+    color: hifi.colors.darkGray;
+    
+    property string title: "Security Settings";
+    property bool walletSetUp;
+
+    Connections {
+        target: Commerce;
+
+        onWalletStatusResult: {
+            if (walletStatus === 5) {
+                Commerce.getSecurityImage();
+                root.walletSetUp = true;
+            } else {
+                root.walletSetUp = false;
+            }
+        }
+
+        onSecurityImageResult: {
+            if (exists) {
+                currentSecurityPicture.source = "";
+                currentSecurityPicture.source = "image://security/securityImage";
+            }
+        }
+    }
+
+    HifiCommerceCommon.CommerceLightbox {
+        id: lightboxPopup;
+        visible: false;
+        anchors.fill: parent;
+    }
+
+    // Username Text
+    HifiStylesUit.RalewayRegular {
+        id: usernameText;
+        text: Account.username === "" ? Account.username : "Please Log In";
+        // Text size
+        size: 24;
+        // Style
+        color: hifi.colors.white;
+        elide: Text.ElideRight;
+        // Anchors
+        anchors.top: parent.top;
+        anchors.left: parent.left;
+        anchors.leftMargin: 20;
+        anchors.right: parent.right;
+        anchors.rightMargin: 20;
+        height: 80;
+    }
+
+    Item {
+        id: pleaseLogInContainer;
+        visible: Account.username === "";
+        anchors.top: usernameText.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        HifiStylesUit.RalewayRegular {
+            text: "Please log in for security settings."
+            // Text size
+            size: 24;
+            // Style
+            color: hifi.colors.white;
+            // Anchors
+            anchors.bottom: openLoginButton.top;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            horizontalAlignment: Text.AlignHCenter;
+            verticalAlignment: Text.AlignVCenter;
+            height: 80;
+        }
+        
+        HifiControlsUit.Button {
+            id: openLoginButton;
+            color: hifi.buttons.white;
+            colorScheme: hifi.colorSchemes.dark;
+            anchors.centerIn: parent;
+            width: 140;
+            height: 40;
+            text: "Change";
+            onClicked: {
+                DialogsManager.showLoginDialog();
+            }
+        }
+    }
+
+    Item {
+        id: securitySettingsContainer;
+        visible: !pleaseLogInContainer.visible;
+        anchors.top: usernameText.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        Item {
+            id: accountContainer;
+            anchors.top: securitySettingsContainer.top;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: childrenRect.height;
+
+            Rectangle {
+                id: accountHeaderContainer;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;
+                color: hifi.colors.baseGrayHighlight;
+
+                HifiStylesUit.RalewaySemiBold {
+                    text: "Account";
+                    anchors.fill: parent;
+                    anchors.leftMargin: 20;
+                }
+            }
+
+            Item {
+                id: keepMeLoggedInContainer;
+                anchors.top: accountHeaderContainer.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;            
+
+                HifiControlsUit.CheckBox {
+                    id: autoLogoutCheckbox;
+                    checked: Settings.getValue("keepMeLoggedIn", false);
+                    text: "Keep Me Logged In"
+                    // Anchors
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 20;
+                    boxSize: 28;
+                    labelFontSize: 18;
+                    color: hifi.colors.white;
+                    onCheckedChanged: {
+                        Settings.setValue("keepMeLoggedIn", checked);
+                        if (checked) {
+                            Settings.setValue("keepMeLoggedIn/savedUsername", Account.username);
+                        } else {
+                            Settings.setValue("keepMeLoggedIn/savedUsername", "");
+                        }
+                    }
+                }
+
+                HifiStylesUit.RalewaySemiBold {
+                    id: autoLogoutHelp;
+                    text: '[?]';
+                    // Anchors
+                    anchors.verticalCenter: parent.verticalCenter;
+                    anchors.right: autoLogoutCheckbox.right;
+                    width: 30;
+                    height: 30;
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.blueHighlight;
+
+                    MouseArea {
+                        anchors.fill: parent;
+                        hoverEnabled: true;
+                        onEntered: {
+                            parent.color = hifi.colors.blueAccent;
+                        }
+                        onExited: {
+                            parent.color = hifi.colors.blueHighlight;
+                        }
+                        onClicked: {
+                            lightboxPopup.titleText = "Keep Me Logged In";
+                            lightboxPopup.bodyText = "If you choose to stay logged in, ensure that this is a trusted device.\n\n" +
+                                "Also, remember that logging out may not disconnect you from a domain.";
+                            lightboxPopup.button1text = "OK";
+                            lightboxPopup.button1method = function() {
+                                lightboxPopup.visible = false;
+                            }
+                            lightboxPopup.visible = true;
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: walletContainer;
+            anchors.top: accountContainer.bottom;
+            anchors.left: parent.left;
+            anchors.right: parent.right;
+            height: childrenRect.height;
+
+            Rectangle {
+                id: walletHeaderContainer;
+                anchors.top: parent.top;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;
+                color: hifi.colors.baseGrayHighlight;
+
+                HifiStylesUit.RalewaySemiBold {
+                    text: "Wallet";
+                    anchors.fill: parent;
+                    anchors.leftMargin: 20;
+                }
+            }
+
+            Item {
+                id: walletSecurityPictureContainer;
+                visible: root.walletSetUp;
+                anchors.top: walletHeaderContainer.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;
+
+                Image {
+                    id: currentSecurityPicture;
+                    source: "";
+                    visible: true;
+                    anchors.left: parent.left;
+                    anchors.leftMargin: 20;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    height: 40;
+                    width: height;
+                    mipmap: true;
+                    cache: false;
+                }
+
+                HifiStylesUit.RalewayRegular {
+                    id: securityPictureText;
+                    text: "Wallet Security Picture";
+                    // Anchors
+                    anchors.top: parent.top;
+                    anchors.bottom: parent.bottom;
+                    anchors.left: currentSecurityPicture.right;
+                    anchors.leftMargin: 12;
+                    width: paintedWidth;
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.white;
+                }
+
+                // "Change Security Pic" button
+                HifiControlsUit.Button {
+                    id: changeSecurityImageButton;
+                    color: hifi.buttons.white;
+                    colorScheme: hifi.colorSchemes.dark;
+                    anchors.left: securityPictureText.right;
+                    anchors.verticalCenter: parent.verticalCenter;
+                    width: 140;
+                    height: 40;
+                    text: "Change";
+                    onClicked: {
+                    
+                    }
+                }
+            }
+
+            Item {
+                id: walletNotSetUpContainer;
+                visible: !root.walletSetUp;
+                anchors.top: walletHeaderContainer.bottom;
+                anchors.left: parent.left;
+                anchors.right: parent.right;
+                height: 80;
+
+                HifiStylesUit.RalewayRegular {
+                    text: "Your wallet is not set up.\n" +
+                        "Open the WALLET app to get started.";
+                    // Anchors
+                    anchors.fill: parent;
+                    // Text size
+                    size: 18;
+                    // Style
+                    color: hifi.colors.white;
+                    horizontalAlignment: Text.AlignHCenter;
+                    verticalAlignment: Text.AlignVCenter;
+                }
+            }
+        }
+    }
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
similarity index 89%
rename from interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
rename to interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
index 01df18352b..d953a764fd 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
@@ -1,11 +1,11 @@
 //
 //  SecurityImageChange.qml
-//  qml/hifi/commerce/wallet
+//  qml\hifi\dialogs\security
 //
-//  SecurityImageChange
+//  Security
 //
-//  Created by Zach Fox on 2017-08-18
-//  Copyright 2017 High Fidelity, Inc.
+//  Created by Zach Fox on 2018-10-31
+//  Copyright 2018 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -13,9 +13,9 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
-import "../../../controls" as HifiControls
+import "qrc:////qml//styles-uit" as HifiStylesUit
+import "qrc:////qml//controls-uit" as HifiControlsUit
+import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
 
@@ -33,7 +33,7 @@ Item {
             securityImageChangePageSecurityImage.source = "image://security/securityImage";
             if (exists) { // Success submitting new security image
                 if (root.justSubmitted) {
-                    sendSignalToWallet({method: "walletSecurity_changeSecurityImageSuccess"});
+                    sendSignalToParent({method: "walletSecurity_changeSecurityImageSuccess"});
                     root.justSubmitted = false;
                 }
             } else if (root.justSubmitted) {
@@ -83,10 +83,10 @@ Item {
                 verticalAlignment: Text.AlignBottom;
                 color: hifi.colors.white;
             }
-            // "Security image" text below pic
+            // "Security image" text below image
             RalewayRegular {
                 id: securityImageText;
-                text: "SECURITY PIC";
+                text: "SECURITY IMAGE";
                 // Text size
                 size: 12;
                 // Anchors
@@ -118,7 +118,7 @@ Item {
         // "Change Security Image" text
         RalewaySemiBold {
             id: securityImageTitle;
-            text: "Change Security Pic:";
+            text: "Change Security Image:";
             // Text size
             size: 18;
             anchors.top: parent.top;
@@ -139,12 +139,6 @@ Item {
             anchors.right: parent.right;
             anchors.rightMargin: 16;
             height: 300;
-        
-            Connections {
-                onSendSignalToWallet: {
-                    sendSignalToWallet(msg);
-                }
-            }
         }
 
         // Navigation Bar
@@ -169,7 +163,7 @@ Item {
                 width: 150;
                 text: "Cancel"
                 onClicked: {
-                    sendSignalToWallet({method: "walletSecurity_changeSecurityImageCancelled"});
+                    sendSignalToParent({method: "walletSecurity_changeSecurityImageCancelled"});
                 }
             }
 
@@ -197,7 +191,7 @@ Item {
     // SECURITY IMAGE SELECTION END
     //
 
-    signal sendSignalToWallet(var msg);
+    signal sendSignalToParent(var msg);
 
     function initModel() {
         securityImageSelection.initModel();
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageModel.qml
similarity index 89%
rename from interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
rename to interface/resources/qml/hifi/dialogs/security/SecurityImageModel.qml
index b8e9db09ab..946f979c1a 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageModel.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageModel.qml
@@ -1,11 +1,11 @@
 //
 //  SecurityImageModel.qml
-//  qml/hifi/commerce
+//  qml\hifi\dialogs\security
 //
-//  SecurityImageModel
+//  Security
 //
-//  Created by Zach Fox on 2017-08-17
-//  Copyright 2017 High Fidelity, Inc.
+//  Created by Zach Fox on 2018-10-31
+//  Copyright 2018 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
diff --git a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
similarity index 88%
rename from interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
rename to interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
index 599c6a1851..5a05a28ba3 100644
--- a/interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
@@ -1,11 +1,11 @@
 //
 //  SecurityImageSelection.qml
-//  qml/hifi/commerce/wallet
+//  qml\hifi\dialogs\security
 //
-//  SecurityImageSelection
+//  Security
 //
-//  Created by Zach Fox on 2017-08-17
-//  Copyright 2017 High Fidelity, Inc.
+//  Created by Zach Fox on 2018-10-31
+//  Copyright 2018 High Fidelity, Inc.
 //
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@@ -13,9 +13,9 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
-import "../../../controls" as HifiControls
+import "qrc:////qml//styles-uit" as HifiStylesUit
+import "qrc:////qml//controls-uit" as HifiControlsUit
+import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
 
@@ -73,8 +73,6 @@ Item {
     //
     // FUNCTION DEFINITIONS START
     //
-    signal sendSignalToWallet(var msg);
-
     function getImagePathFromImageID(imageID) {
         return (imageID ? gridModel.getImagePathFromImageID(imageID) : "");
     }
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml b/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml
new file mode 100644
index 0000000000..7c17818225
--- /dev/null
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml
@@ -0,0 +1,30 @@
+//
+//  SecurityWrapper.qml
+//  qml\hifi\dialogs\security
+//
+//  SecurityWrapper
+//
+//  Created by Zach Fox on 2018-10-31
+//  Copyright 2018 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+import "qrc:////qml//windows"
+import "./"
+
+ScrollingWindow {
+    id: root;
+
+    resizable: true;
+    destroyOnHidden: true;
+    width: 400;
+    height: 577;
+    minSize: Qt.vector2d(400, 500);
+
+    Security { id: security; width: root.width }
+
+    objectName: "SecurityDialog";
+    title: security.title;
+}
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/01.jpg b/interface/resources/qml/hifi/dialogs/security/images/01.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/01.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/01.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/02.jpg b/interface/resources/qml/hifi/dialogs/security/images/02.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/02.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/02.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/03.jpg b/interface/resources/qml/hifi/dialogs/security/images/03.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/03.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/03.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/04.jpg b/interface/resources/qml/hifi/dialogs/security/images/04.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/04.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/04.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/05.jpg b/interface/resources/qml/hifi/dialogs/security/images/05.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/05.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/05.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/06.jpg b/interface/resources/qml/hifi/dialogs/security/images/06.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/06.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/06.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/07.jpg b/interface/resources/qml/hifi/dialogs/security/images/07.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/07.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/07.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/08.jpg b/interface/resources/qml/hifi/dialogs/security/images/08.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/08.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/08.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/09.jpg b/interface/resources/qml/hifi/dialogs/security/images/09.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/09.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/09.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/10.jpg b/interface/resources/qml/hifi/dialogs/security/images/10.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/10.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/10.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/11.jpg b/interface/resources/qml/hifi/dialogs/security/images/11.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/11.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/11.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/12.jpg b/interface/resources/qml/hifi/dialogs/security/images/12.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/12.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/12.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/13.jpg b/interface/resources/qml/hifi/dialogs/security/images/13.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/13.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/13.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/14.jpg b/interface/resources/qml/hifi/dialogs/security/images/14.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/14.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/14.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/15.jpg b/interface/resources/qml/hifi/dialogs/security/images/15.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/15.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/15.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/16.jpg b/interface/resources/qml/hifi/dialogs/security/images/16.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/16.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/16.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/17.jpg b/interface/resources/qml/hifi/dialogs/security/images/17.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/17.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/17.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/18.jpg b/interface/resources/qml/hifi/dialogs/security/images/18.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/18.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/18.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/19.jpg b/interface/resources/qml/hifi/dialogs/security/images/19.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/19.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/19.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/20.jpg b/interface/resources/qml/hifi/dialogs/security/images/20.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/20.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/20.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/21.jpg b/interface/resources/qml/hifi/dialogs/security/images/21.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/21.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/21.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/22.jpg b/interface/resources/qml/hifi/dialogs/security/images/22.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/22.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/22.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/23.jpg b/interface/resources/qml/hifi/dialogs/security/images/23.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/23.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/23.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/24.jpg b/interface/resources/qml/hifi/dialogs/security/images/24.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/24.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/24.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/25.jpg b/interface/resources/qml/hifi/dialogs/security/images/25.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/25.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/25.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/26.jpg b/interface/resources/qml/hifi/dialogs/security/images/26.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/26.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/26.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/27.jpg b/interface/resources/qml/hifi/dialogs/security/images/27.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/27.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/27.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/28.jpg b/interface/resources/qml/hifi/dialogs/security/images/28.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/28.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/28.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/29.jpg b/interface/resources/qml/hifi/dialogs/security/images/29.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/29.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/29.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/30.jpg b/interface/resources/qml/hifi/dialogs/security/images/30.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/30.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/30.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/31.jpg b/interface/resources/qml/hifi/dialogs/security/images/31.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/31.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/31.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/32.jpg b/interface/resources/qml/hifi/dialogs/security/images/32.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/32.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/32.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/33.jpg b/interface/resources/qml/hifi/dialogs/security/images/33.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/33.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/33.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/34.jpg b/interface/resources/qml/hifi/dialogs/security/images/34.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/34.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/34.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png b/interface/resources/qml/hifi/dialogs/security/images/lowerKeyboard.png
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png
rename to interface/resources/qml/hifi/dialogs/security/images/lowerKeyboard.png
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg b/interface/resources/qml/hifi/dialogs/security/images/wallet-bg.jpg
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg
rename to interface/resources/qml/hifi/dialogs/security/images/wallet-bg.jpg
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png b/interface/resources/qml/hifi/dialogs/security/images/wallet-tip-bg.png
similarity index 100%
rename from interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png
rename to interface/resources/qml/hifi/dialogs/security/images/wallet-tip-bg.png
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 7cd91d76a0..1ca71a70d9 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -382,7 +382,7 @@ static const int INTERVAL_TO_CHECK_HMD_WORN_STATUS = 500; // milliseconds
 static const QString DESKTOP_DISPLAY_PLUGIN_NAME = "Desktop";
 static const QString ACTIVE_DISPLAY_PLUGIN_SETTING_NAME = "activeDisplayPlugin";
 static const QString SYSTEM_TABLET = "com.highfidelity.interface.tablet.system";
-static const QString AUTO_LOGOUT_SETTING_NAME = "wallet/autoLogout";
+static const QString KEEP_ME_LOGGED_IN_SETTING_NAME = "keepMeLoggedIn";
 
 const std::vector<std::pair<QString, Application::AcceptURLMethod>> Application::_acceptedExtensions {
     { SVO_EXTENSION, &Application::importSVOFromURL },
@@ -2567,7 +2567,7 @@ void Application::cleanupBeforeQuit() {
     }
     DependencyManager::destroy<ScriptEngines>();
 
-    bool autoLogout = Setting::Handle<bool>(AUTO_LOGOUT_SETTING_NAME, false).get();
+    bool autoLogout = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get();
     if (autoLogout) {
         DependencyManager::get<AccountManager>()->removeAccountFromFile();
     }
@@ -2944,13 +2944,13 @@ void Application::initializeUi() {
         QUrl{ "hifi/commerce/wallet/PassphraseChange.qml" },
         QUrl{ "hifi/commerce/wallet/PassphraseModal.qml" },
         QUrl{ "hifi/commerce/wallet/PassphraseSelection.qml" },
-        QUrl{ "hifi/commerce/wallet/Security.qml" },
-        QUrl{ "hifi/commerce/wallet/SecurityImageChange.qml" },
-        QUrl{ "hifi/commerce/wallet/SecurityImageModel.qml" },
-        QUrl{ "hifi/commerce/wallet/SecurityImageSelection.qml" },
         QUrl{ "hifi/commerce/wallet/Wallet.qml" },
         QUrl{ "hifi/commerce/wallet/WalletHome.qml" },
         QUrl{ "hifi/commerce/wallet/WalletSetup.qml" },
+        QUrl{ "hifi/dialogs/security/Security.qml" },
+        QUrl{ "hifi/dialogs/security/SecurityImageChange.qml" },
+        QUrl{ "hifi/dialogs/security/SecurityImageModel.qml" },
+        QUrl{ "hifi/dialogs/security/SecurityImageSelection.qml" },
     }, callback);
     qmlRegisterType<ResourceImageItem>("Hifi", 1, 0, "ResourceImageItem");
     qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 539bdabe7d..e16da6781d 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -265,6 +265,13 @@ Menu::Menu() {
             QString("hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
     });
 
+    // Settings > Security...
+    action = addActionToQMenuAndActionHash(settingsMenu, "Security...");
+    connect(action, &QAction::triggered, [] {
+        qApp->showDialog(QString("hifi/dialogs/security/SecurityWrapper.qml"),
+            QString("hifi/dialogs/security/Security.qml"), "SecurityDialog");
+    });
+
     // Settings > Developer Menu
     addCheckableActionToQMenuAndActionHash(settingsMenu, "Developer Menu", 0, false, this, SLOT(toggleDeveloperMenus()));
 
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 5b91afea33..2d44650d9c 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -376,9 +376,9 @@ function deleteSendMoneyParticleEffect() {
 }
 
 function onUsernameChanged() {
-    if (Account.username !== Settings.getValue("wallet/savedUsername")) {
-        Settings.setValue("wallet/autoLogout", false);
-        Settings.setValue("wallet/savedUsername", "");
+    if (Account.username !== Settings.getValue("keepMeLoggedIn/savedUsername")) {
+        Settings.setValue("keepMeLoggedIn", false);
+        Settings.setValue("keepMeLoggedIn/savedUsername", "");
     }
 }
 

From e6c3e7e67f31b30613bf1a86dd60ece38731bfb7 Mon Sep 17 00:00:00 2001
From: David Kelly <davidmichaelkelly@gmail.com>
Date: Wed, 31 Oct 2018 14:41:49 -0700
Subject: [PATCH 34/73] initial purge of security tab from wallet

---
 .../qml/hifi/commerce/wallet/Help.qml         |   7 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       | 132 +-----------------
 2 files changed, 8 insertions(+), 131 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 6d8fc3c33f..6cf00f78eb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -74,8 +74,7 @@ In your Wallet's Send Money tab, choose from your list of connections, or choose
             isExpanded: false;
             question: "What is a Security Pic?"
             answer: "Your Security Pic acts as an extra layer of Wallet security. \
-When you see your Security Pic, you know that your actions and data are securely making use of your account. \
-<br><br><b><font color='#0093C5'><a href='#securitypic'>Tap here to change your Security Pic.</a></font></b>";
+When you see your Security Pic, you know that your actions and data are securely making use of your account.";
         }
         ListElement {
             isExpanded: false;
@@ -137,7 +136,7 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                 anchors.left: parent.left;
                 width: parent.width;
                 height: questionText.paintedHeight + 50;
-            
+
                 RalewaySemiBold {
                     id: plusMinusButton;
                     text: model.isExpanded ? "-" : "+";
@@ -217,8 +216,6 @@ At the moment, there is currently no way to convert HFC to other currencies. Sta
                             }
                         } else if (link === "#support") {
                             Qt.openUrlExternally("mailto:support@highfidelity.com");
-                        } else if (link === "#securitypic") {
-                            sendSignalToWallet({method: 'walletSecurity_changeSecurityImage'});
                         }
                     }
                 }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index cbb77883df..f2119a1a8f 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -232,10 +232,6 @@ Rectangle {
                         root.isPassword = msg.isPasswordField;
                     } else if (msg.method === 'walletSetup_lowerKeyboard') {
                         root.keyboardRaised = false;
-                    } else if (msg.method === 'walletSecurity_changePassphraseCancelled') {
-                        root.activeView = "security";
-                    } else if (msg.method === 'walletSecurity_changePassphraseSuccess') {
-                        root.activeView = "security";
                     } else {
                         sendToScript(msg);
                     }
@@ -245,27 +241,6 @@ Rectangle {
             }
         }
     }
-    SecurityImageChange {
-        id: securityImageChange;
-        visible: root.activeView === "securityImageChange";
-        z: 997;
-        anchors.top: titleBarContainer.bottom;
-        anchors.left: parent.left;
-        anchors.right: parent.right;
-        anchors.bottom: parent.bottom;
-
-        Connections {
-            onSendSignalToWallet: {
-                if (msg.method === 'walletSecurity_changeSecurityImageCancelled') {
-                    root.activeView = "security";
-                } else if (msg.method === 'walletSecurity_changeSecurityImageSuccess') {
-                    root.activeView = "security";
-                } else {
-                    sendToScript(msg);
-                }
-            }
-        }
-    }
 
     //
     // TAB CONTENTS START
@@ -366,39 +341,6 @@ Rectangle {
         }
     }
 
-    Security {
-        id: security;
-        visible: root.activeView === "security";
-        anchors.top: titleBarContainer.bottom;
-        anchors.bottom: tabButtonsContainer.top;
-        anchors.left: parent.left;
-        anchors.right: parent.right;
-
-        Connections {
-            onSendSignalToWallet: {
-                if (msg.method === 'walletSecurity_changePassphrase') {
-                    root.activeView = "passphraseChange";
-                    passphraseChange.clearPassphraseFields();
-                    passphraseChange.resetSubmitButton();
-                } else if (msg.method === 'walletSecurity_changeSecurityImage') {
-                    securityImageChange.initModel();
-                    root.activeView = "securityImageChange";
-                } else if (msg.method === 'walletSecurity_autoLogoutHelp') {
-                    lightboxPopup.titleText = "Automatically Log Out";
-                    lightboxPopup.bodyText = "By default, after you log in to High Fidelity, you will stay logged in to your High Fidelity " +
-                        "account even after you close and re-open Interface. This means anyone who opens Interface on your computer " +
-                        "could make purchases with your Wallet.\n\n" +
-                        "If you do not want to stay logged in across Interface sessions, check this box.";
-                    lightboxPopup.button1text = "CLOSE";
-                    lightboxPopup.button1method = function() {
-                        lightboxPopup.visible = false;
-                    }
-                    lightboxPopup.visible = true;
-                }
-            }
-        }
-    }
-
     Help {
         id: help;
         visible: root.activeView === "help";
@@ -407,14 +349,6 @@ Rectangle {
         anchors.left: parent.left;
         anchors.right: parent.right;
 
-        Connections {
-            onSendSignalToWallet: {
-                if (msg.method === 'walletSecurity_changeSecurityImage') {
-                    securityImageChange.initModel();
-                    root.activeView = "securityImageChange";
-                }
-            }
-        }
     }
 
 
@@ -428,7 +362,7 @@ Rectangle {
     Item {
         id: tabButtonsContainer;
         visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep";
-        property int numTabs: 5;
+        property int numTabs: 4;
         // Size
         width: root.width;
         height: 90;
@@ -452,7 +386,7 @@ Rectangle {
             anchors.left: parent.left;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
-        
+
             HiFiGlyphs {
                 id: homeTabIcon;
                 text: hifi.glyphs.home2;
@@ -506,7 +440,7 @@ Rectangle {
             anchors.left: walletHomeButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
-        
+
             HiFiGlyphs {
                 id: exchangeMoneyTabIcon;
                 text: hifi.glyphs.leftRightArrows;
@@ -550,7 +484,7 @@ Rectangle {
             anchors.left: exchangeMoneyButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
-        
+
             HiFiGlyphs {
                 id: sendMoneyTabIcon;
                 text: hifi.glyphs.paperPlane;
@@ -596,70 +530,16 @@ Rectangle {
             }
         }
 
-        // "SECURITY" tab button
-        Rectangle {
-            id: securityButtonContainer;
-            visible: !walletSetup.visible;
-            color: root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
-            anchors.top: parent.top;
-            anchors.left: sendMoneyButtonContainer.right;
-            anchors.bottom: parent.bottom;
-            width: parent.width / tabButtonsContainer.numTabs;
-        
-            HiFiGlyphs {
-                id: securityTabIcon;
-                text: hifi.glyphs.lock;
-                // Size
-                size: 38;
-                // Anchors
-                anchors.horizontalCenter: parent.horizontalCenter;
-                anchors.top: parent.top;
-                anchors.topMargin: 2;
-                // Style
-                color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
-            }
-
-            RalewaySemiBold {
-                text: "SECURITY";
-                // Text size
-                size: 16;
-                // Anchors
-                anchors.bottom: parent.bottom;
-                height: parent.height/2;
-                anchors.left: parent.left;
-                anchors.leftMargin: 4;
-                anchors.right: parent.right;
-                anchors.rightMargin: 4;
-                // Style
-                color: root.activeView === "security" || securityTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
-                wrapMode: Text.WordWrap;
-                // Alignment
-                horizontalAlignment: Text.AlignHCenter;
-                verticalAlignment: Text.AlignTop;
-            }
-            MouseArea {
-                id: securityTabMouseArea;
-                anchors.fill: parent;
-                hoverEnabled: enabled;
-                onClicked: {
-                    root.activeView = "security";
-                    tabButtonsContainer.resetTabButtonColors();
-                }
-                onEntered: parent.color = hifi.colors.blueHighlight;
-                onExited: parent.color = root.activeView === "security" ? hifi.colors.blueAccent : hifi.colors.black;
-            }
-        }
-        
         // "HELP" tab button
         Rectangle {
             id: helpButtonContainer;
             visible: !walletSetup.visible;
             color: root.activeView === "help" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: securityButtonContainer.right;
+            anchors.left: sendMoneyButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
-        
+
             HiFiGlyphs {
                 id: helpTabIcon;
                 text: hifi.glyphs.question;

From 317f4d28ba5e0ac11d19e1aaa8c141df21df5024 Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Wed, 31 Oct 2018 15:41:51 -0700
Subject: [PATCH 35/73] always keep a workload view around MyAvatar

---
 libraries/workload/src/workload/ViewTask.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/libraries/workload/src/workload/ViewTask.cpp b/libraries/workload/src/workload/ViewTask.cpp
index 9d0c693149..0db24f19ba 100644
--- a/libraries/workload/src/workload/ViewTask.cpp
+++ b/libraries/workload/src/workload/ViewTask.cpp
@@ -31,13 +31,25 @@ void SetupViews::run(const WorkloadContextPointer& renderContext, const Input& i
     auto& outViews = outputs;
     outViews.clear();
 
-    // Filter the first view centerer on the avatar head if needed
     if (_views.size() >= 2) {
+        // when inputs contains two or more views:
+        //   index 0 = view from avatar's head
+        //   index 1 = view from camera
+        //   index 2 and higher = secondary camera and whatever
         if (data.useAvatarView) {
+            // for debug purposes we keep the head view and skip that of the camera
             outViews.push_back(_views[0]);
             outViews.insert(outViews.end(), _views.begin() + 2, _views.end());
         } else {
-            outViews.insert(outViews.end(), _views.begin() + 1, _views.end());
+            // otherwise we use all of the views...
+            const float MIN_HEAD_CAMERA_SEPARATION_SQUARED = 0.2f;
+            if (glm::distance2(_views[0].origin, _views[1].origin) < MIN_HEAD_CAMERA_SEPARATION_SQUARED) {
+                // ... unless the first two are close enough to be considered the same
+                // in which case we only keep one of them
+                outViews.insert(outViews.end(), _views.begin() + 1, _views.end());
+            } else {
+                outViews = _views;
+            }
         }
     } else {
         outViews = _views;
@@ -177,7 +189,6 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi
         outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
         outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
         outView.regionBackFronts[workload::Region::R3] = regionBackFronts[workload::Region::R3];
-
         workload::View::updateRegionsFromBackFronts(outView);
     }
 }

From d4e9a7056409e7e071af495917d8be91312c5c19 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 16:12:16 -0700
Subject: [PATCH 36/73] Almost there

---
 .../qml/LoginDialog/LinkAccountBody.qml       |  15 ++-
 .../qml/hifi/commerce/wallet/Wallet.qml       |   4 +-
 .../qml/hifi/commerce/wallet/WalletSetup.qml  | 120 ------------------
 .../qml/hifi/dialogs/security/Security.qml    |  62 +++++++--
 .../dialogs/security/SecurityImageChange.qml  |  13 +-
 .../security/SecurityImageSelection.qml       |  10 +-
 .../hifi/dialogs/security/SecurityWrapper.qml |  30 -----
 interface/src/Application.cpp                 |   4 +-
 interface/src/Menu.cpp                        |   5 +-
 interface/src/commerce/Wallet.cpp             |   2 +-
 10 files changed, 82 insertions(+), 183 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index d5d89cd0b4..3c0577532a 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -239,7 +239,10 @@ Item {
 
             }
 
-            Keys.onReturnPressed: linkAccountBody.login()
+            Keys.onReturnPressed: {
+                Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text);
+                linkAccountBody.login();
+            }
         }
 
         InfoItem {
@@ -264,14 +267,14 @@ Item {
             CheckBox {
                 id: autoLogoutCheckbox
                 checked: Settings.getValue("keepMeLoggedIn", false)
-                text: "Keep me signed in"
+                text: "Keep me logged in"
                 boxSize: 20;
                 labelFontSize: 15
                 color: hifi.colors.black
                 onCheckedChanged: {
                     Settings.setValue("keepMeLoggedIn", checked);
                     if (checked) {
-                        Settings.setValue("keepMeLoggedIn/savedUsername", Account.username);
+                        Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text);
                     } else {
                         Settings.setValue("keepMeLoggedIn/savedUsername", "");
                     }
@@ -289,7 +292,10 @@ Item {
                 text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Log in")
                 color: hifi.buttons.blue
 
-                onClicked: linkAccountBody.login()
+                onClicked: {
+                    Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text);
+                    linkAccountBody.login();
+                }
             }
         }
 
@@ -403,6 +409,7 @@ Item {
         case Qt.Key_Enter:
         case Qt.Key_Return:
             event.accepted = true
+            Settings.setValue("keepMeLoggedIn/savedUsername", usernameField.text);
             linkAccountBody.login()
             break
         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index f2119a1a8f..d032f060e2 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -142,7 +142,7 @@ Rectangle {
         Image {
             id: titleBarSecurityImage;
             source: "";
-            visible: titleBarSecurityImage.source !== "" && !securityImageChange.visible;
+            visible: titleBarSecurityImage.source !== "";
             anchors.right: parent.right;
             anchors.rightMargin: 6;
             anchors.top: parent.top;
@@ -361,7 +361,7 @@ Rectangle {
     //
     Item {
         id: tabButtonsContainer;
-        visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && root.activeView !== "securityImageChange" && sendMoney.currentActiveView !== "sendAssetStep";
+        visible: !needsLogIn.visible && root.activeView !== "passphraseChange" && sendMoney.currentActiveView !== "sendAssetStep";
         property int numTabs: 4;
         // Size
         width: root.width;
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index dc6ce45a74..ecd7234400 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -243,7 +243,6 @@ Item {
             height: 50;
             text: "Set Up Wallet";
             onClicked: {
-                securityImageSelection.initModel();
                 root.activeView = "step_2";
             }
         }
@@ -267,124 +266,6 @@ Item {
     // FIRST PAGE END
     //
 
-    //
-    // SECURITY IMAGE SELECTION START
-    //
-    Item {
-        id: securityImageContainer;
-        visible: root.activeView === "step_2";
-        // Anchors
-        anchors.top: titleBarContainer.bottom;
-        anchors.topMargin: 30;
-        anchors.bottom: parent.bottom;
-        anchors.left: parent.left;
-        anchors.leftMargin: 16;
-        anchors.right: parent.right;
-        anchors.rightMargin: 16;
-
-        // Text below title bar
-        RalewayRegular {
-            id: securityImageTitleHelper;
-            text: "Choose a Security Pic:";
-            // Text size
-            size: 24;
-            // Anchors
-            anchors.top: parent.top;
-            anchors.left: parent.left;
-            height: 50;
-            width: paintedWidth;
-            // Style
-            color: hifi.colors.white;
-            // Alignment
-            horizontalAlignment: Text.AlignHLeft;
-            verticalAlignment: Text.AlignVCenter;
-        }
-
-        SecurityImageSelection {
-            id: securityImageSelection;
-            // Anchors
-            anchors.top: securityImageTitleHelper.bottom;
-            anchors.left: parent.left;
-            anchors.right: parent.right;
-            height: 300;
-
-            Connections {
-                onSendSignalToWallet: {
-                    sendSignalToWallet(msg);
-                }
-            }
-        }
-
-        // Text below security images
-        RalewayRegular {
-            text: "<b>Your security picture shows you that the service asking for your passphrase is authorized.</b> You can change your secure picture at any time.";
-            // Text size
-            size: 18;
-            // Anchors
-            anchors.top: securityImageSelection.bottom;
-            anchors.topMargin: 40;
-            anchors.left: parent.left;
-            anchors.right: parent.right;
-            height: paintedHeight;
-            // Style
-            color: hifi.colors.white;
-            wrapMode: Text.WordWrap;
-            // Alignment
-            horizontalAlignment: Text.AlignHLeft;
-            verticalAlignment: Text.AlignVCenter;
-        }
-
-        // Navigation Bar
-        Item {
-            // Size
-            width: parent.width;
-            height: 50;
-            // Anchors:
-            anchors.left: parent.left;
-            anchors.bottom: parent.bottom;
-            anchors.bottomMargin: 50;
-
-            // "Back" button
-            HifiControlsUit.Button {
-                color: hifi.buttons.noneBorderlessWhite;
-                colorScheme: hifi.colorSchemes.dark;
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.left: parent.left;
-                anchors.leftMargin: 20;
-                width: 200;
-                text: "Back"
-                onClicked: {
-                    securityImageSelection.resetSelection();
-                    root.activeView = "step_1";
-                }
-            }
-
-            // "Next" button
-            HifiControlsUit.Button {
-                enabled: securityImageSelection.currentIndex !== -1;
-                color: hifi.buttons.blue;
-                colorScheme: hifi.colorSchemes.dark;
-                anchors.top: parent.top;
-                anchors.bottom: parent.bottom;
-                anchors.right: parent.right;
-                anchors.rightMargin: 20;
-                width: 200;
-                text: "Next";
-                onClicked: {
-                    root.lastPage = "step_2";
-                    var securityImagePath = securityImageSelection.getImagePathFromImageID(securityImageSelection.getSelectedImageIndex())
-                    Commerce.chooseSecurityImage(securityImagePath);
-                    root.activeView = "step_3";
-                    passphraseSelection.clearPassphraseFields();
-                }
-            }
-        }
-    }
-    //
-    // SECURITY IMAGE SELECTION END
-    //
-
     //
     // SECURE PASSPHRASE SELECTION START
     //
@@ -525,7 +406,6 @@ Item {
                 width: 200;
                 text: "Back"
                 onClicked: {
-                    securityImageSelection.resetSelection();
                     root.lastPage = "step_3";
                     root.activeView = "step_2";
                 }
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index d1dc2a9e11..3f4d17e838 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -29,6 +29,17 @@ Rectangle {
     
     property string title: "Security Settings";
     property bool walletSetUp;
+    
+    QtObject {
+        id: margins
+        property real paddings: root.width / 20.25
+
+        property real sizeCheckBox: root.width / 13.5
+        property real sizeText: root.width / 2.5
+        property real sizeLevel: root.width / 5.8
+        property real sizeDesktop: root.width / 5.8
+        property real sizeVR: root.width / 13.5
+    }
 
     Connections {
         target: Commerce;
@@ -50,16 +61,37 @@ Rectangle {
         }
     }
 
+    Component.onCompleted: {
+        Commerce.getWalletStatus();
+    }
+
     HifiCommerceCommon.CommerceLightbox {
+        z: 996;
         id: lightboxPopup;
         visible: false;
         anchors.fill: parent;
     }
 
+    SecurityImageChange {
+        id: securityImageChange;
+        visible: false;
+        z: 997;
+        anchors.top: usernameText.bottom;
+        anchors.left: parent.left;
+        anchors.right: parent.right;
+        anchors.bottom: parent.bottom;
+
+        Connections {
+            onSendSignalToParent: {
+                securityImageChange.visible = false;
+            }
+        }
+    }
+
     // Username Text
     HifiStylesUit.RalewayRegular {
         id: usernameText;
-        text: Account.username === "" ? Account.username : "Please Log In";
+        text: Account.username === "Unknown user" ? "Please Log In" : Account.username;
         // Text size
         size: 24;
         // Style
@@ -71,12 +103,12 @@ Rectangle {
         anchors.leftMargin: 20;
         anchors.right: parent.right;
         anchors.rightMargin: 20;
-        height: 80;
+        height: 60;
     }
 
     Item {
         id: pleaseLogInContainer;
-        visible: Account.username === "";
+        visible: Account.username === "Unknown user";
         anchors.top: usernameText.bottom;
         anchors.left: parent.left;
         anchors.right: parent.right;
@@ -94,7 +126,7 @@ Rectangle {
             anchors.right: parent.right;
             horizontalAlignment: Text.AlignHCenter;
             verticalAlignment: Text.AlignVCenter;
-            height: 80;
+            height: 60;
         }
         
         HifiControlsUit.Button {
@@ -104,7 +136,7 @@ Rectangle {
             anchors.centerIn: parent;
             width: 140;
             height: 40;
-            text: "Change";
+            text: "Log In";
             onClicked: {
                 DialogsManager.showLoginDialog();
             }
@@ -131,13 +163,15 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                height: 80;
+                height: 70;
                 color: hifi.colors.baseGrayHighlight;
 
                 HifiStylesUit.RalewaySemiBold {
                     text: "Account";
                     anchors.fill: parent;
                     anchors.leftMargin: 20;
+                    color: hifi.colors.white;
+                    size: 18;
                 }
             }
 
@@ -156,9 +190,11 @@ Rectangle {
                     anchors.verticalCenter: parent.verticalCenter;
                     anchors.left: parent.left;
                     anchors.leftMargin: 20;
-                    boxSize: 28;
+                    boxSize: 24;
                     labelFontSize: 18;
+                    colorScheme: hifi.colorSchemes.dark
                     color: hifi.colors.white;
+                    width: 240;
                     onCheckedChanged: {
                         Settings.setValue("keepMeLoggedIn", checked);
                         if (checked) {
@@ -218,13 +254,15 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                height: 80;
+                height: 70;
                 color: hifi.colors.baseGrayHighlight;
 
                 HifiStylesUit.RalewaySemiBold {
                     text: "Wallet";
                     anchors.fill: parent;
                     anchors.leftMargin: 20;
+                    color: hifi.colors.white;
+                    size: 18;
                 }
             }
 
@@ -249,7 +287,7 @@ Rectangle {
                     cache: false;
                 }
 
-                HifiStylesUit.RalewayRegular {
+                HifiStylesUit.RalewaySemiBold {
                     id: securityPictureText;
                     text: "Wallet Security Picture";
                     // Anchors
@@ -270,12 +308,14 @@ Rectangle {
                     color: hifi.buttons.white;
                     colorScheme: hifi.colorSchemes.dark;
                     anchors.left: securityPictureText.right;
+                    anchors.leftMargin: 12;
                     anchors.verticalCenter: parent.verticalCenter;
                     width: 140;
                     height: 40;
                     text: "Change";
                     onClicked: {
-                    
+                        securityImageChange.visible = true;
+                        securityImageChange.initModel();
                     }
                 }
             }
@@ -286,7 +326,7 @@ Rectangle {
                 anchors.top: walletHeaderContainer.bottom;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                height: 80;
+                height: 60;
 
                 HifiStylesUit.RalewayRegular {
                     text: "Your wallet is not set up.\n" +
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
index d953a764fd..0007b98291 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
@@ -19,10 +19,11 @@ import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
 
-Item {
-    HifiConstants { id: hifi; }
+Rectangle {
+    HifiStylesUit.HifiConstants { id: hifi; }
 
     id: root;
+    color: hifi.colors.darkGray;
     property bool justSubmitted: false;
 
     Connections {
@@ -72,7 +73,7 @@ Item {
             anchors.bottom: parent.bottom;
             height: 22;
             // Lock icon
-            HiFiGlyphs {
+            HifiStylesUit.HiFiGlyphs {
                 id: lockIcon;
                 text: hifi.glyphs.lock;
                 anchors.bottom: parent.bottom;
@@ -84,9 +85,9 @@ Item {
                 color: hifi.colors.white;
             }
             // "Security image" text below image
-            RalewayRegular {
+            HifiStylesUit.RalewayRegular {
                 id: securityImageText;
-                text: "SECURITY IMAGE";
+                text: "SECURITY PIC";
                 // Text size
                 size: 12;
                 // Anchors
@@ -116,7 +117,7 @@ Item {
         anchors.bottom: parent.bottom;
 
         // "Change Security Image" text
-        RalewaySemiBold {
+        HifiStylesUit.RalewaySemiBold {
             id: securityImageTitle;
             text: "Change Security Image:";
             // Text size
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
index 5a05a28ba3..f058aad40a 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
@@ -20,7 +20,7 @@ import "qrc:////qml//controls" as HifiControls
 // references XXX from root context
 
 Item {
-    HifiConstants { id: hifi; }
+    HifiStylesUit.HifiConstants { id: hifi; }
 
     id: root;
     property alias currentIndex: securityImageGrid.currentIndex;
@@ -64,10 +64,10 @@ Item {
             }
         }
         highlight: Rectangle {
-                width: securityImageGrid.cellWidth;
-                height: securityImageGrid.cellHeight;
-                color: hifi.colors.blueHighlight;
-            }
+            width: securityImageGrid.cellWidth;
+            height: securityImageGrid.cellHeight;
+            color: hifi.colors.blueHighlight;
+        }
     }
 
     //
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml b/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml
deleted file mode 100644
index 7c17818225..0000000000
--- a/interface/resources/qml/hifi/dialogs/security/SecurityWrapper.qml
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-//  SecurityWrapper.qml
-//  qml\hifi\dialogs\security
-//
-//  SecurityWrapper
-//
-//  Created by Zach Fox on 2018-10-31
-//  Copyright 2018 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import "qrc:////qml//windows"
-import "./"
-
-ScrollingWindow {
-    id: root;
-
-    resizable: true;
-    destroyOnHidden: true;
-    width: 400;
-    height: 577;
-    minSize: Qt.vector2d(400, 500);
-
-    Security { id: security; width: root.width }
-
-    objectName: "SecurityDialog";
-    title: security.title;
-}
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 1ca71a70d9..245e6c0017 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -2567,8 +2567,8 @@ void Application::cleanupBeforeQuit() {
     }
     DependencyManager::destroy<ScriptEngines>();
 
-    bool autoLogout = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get();
-    if (autoLogout) {
+    bool keepMeLoggedIn = Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, false).get();
+    if (!keepMeLoggedIn) {
         DependencyManager::get<AccountManager>()->removeAccountFromFile();
     }
 
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index e16da6781d..3636a2f45a 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -268,8 +268,9 @@ Menu::Menu() {
     // Settings > Security...
     action = addActionToQMenuAndActionHash(settingsMenu, "Security...");
     connect(action, &QAction::triggered, [] {
-        qApp->showDialog(QString("hifi/dialogs/security/SecurityWrapper.qml"),
-            QString("hifi/dialogs/security/Security.qml"), "SecurityDialog");
+        auto tablet = dynamic_cast<TabletProxy*>(
+            DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
+        tablet->loadQMLSource(QString("hifi/dialogs/security/Security.qml"));
     });
 
     // Settings > Developer Menu
diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp
index 5b8417be7c..0e9ad7d79a 100644
--- a/interface/src/commerce/Wallet.cpp
+++ b/interface/src/commerce/Wallet.cpp
@@ -687,7 +687,7 @@ void Wallet::chooseSecurityImage(const QString& filename) {
         delete _securityImage;
     }
     QString path = PathUtils::resourcesPath();
-    path.append("/qml/hifi/commerce/wallet/");
+    path.append("/qml/hifi/dialogs/security/");
     path.append(filename);
 
     // now create a new security image pixmap

From 162a08b9935986a46caaf86648191186e1637d95 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 31 Oct 2018 16:14:26 -0700
Subject: [PATCH 37/73] Restore certain images

---
 .../wallet}/images/lowerKeyboard.png                | Bin
 .../wallet}/images/wallet-bg.jpg                    | Bin
 .../wallet}/images/wallet-tip-bg.png                | Bin
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename interface/resources/qml/hifi/{dialogs/security => commerce/wallet}/images/lowerKeyboard.png (100%)
 rename interface/resources/qml/hifi/{dialogs/security => commerce/wallet}/images/wallet-bg.jpg (100%)
 rename interface/resources/qml/hifi/{dialogs/security => commerce/wallet}/images/wallet-tip-bg.png (100%)

diff --git a/interface/resources/qml/hifi/dialogs/security/images/lowerKeyboard.png b/interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png
similarity index 100%
rename from interface/resources/qml/hifi/dialogs/security/images/lowerKeyboard.png
rename to interface/resources/qml/hifi/commerce/wallet/images/lowerKeyboard.png
diff --git a/interface/resources/qml/hifi/dialogs/security/images/wallet-bg.jpg b/interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg
similarity index 100%
rename from interface/resources/qml/hifi/dialogs/security/images/wallet-bg.jpg
rename to interface/resources/qml/hifi/commerce/wallet/images/wallet-bg.jpg
diff --git a/interface/resources/qml/hifi/dialogs/security/images/wallet-tip-bg.png b/interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png
similarity index 100%
rename from interface/resources/qml/hifi/dialogs/security/images/wallet-tip-bg.png
rename to interface/resources/qml/hifi/commerce/wallet/images/wallet-tip-bg.png

From a1eee351e94e292cc34d0c752f859cef4d3f8af8 Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Wed, 31 Oct 2018 16:24:57 -0700
Subject: [PATCH 38/73] Change "Proofs" to "My Submissions" in assets filter.

---
 interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index 41453c9790..ced5450290 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -498,7 +498,7 @@ Rectangle {
                             "filterName": "updated"
                         },
                         {
-                            "displayName": "Proofs",
+                            "displayName": "My Submissions",
                             "filterName": "proofs"
                         }
                     ]

From cfec94f3fffe56e7a184b7674fa9e5abf690970c Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 1 Nov 2018 09:28:31 -0700
Subject: [PATCH 39/73] larger threshold btw 1 vs 2 workload views for 3rd
 person

---
 libraries/workload/src/workload/ViewTask.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/workload/src/workload/ViewTask.cpp b/libraries/workload/src/workload/ViewTask.cpp
index 0db24f19ba..0a268df9fc 100644
--- a/libraries/workload/src/workload/ViewTask.cpp
+++ b/libraries/workload/src/workload/ViewTask.cpp
@@ -42,7 +42,7 @@ void SetupViews::run(const WorkloadContextPointer& renderContext, const Input& i
             outViews.insert(outViews.end(), _views.begin() + 2, _views.end());
         } else {
             // otherwise we use all of the views...
-            const float MIN_HEAD_CAMERA_SEPARATION_SQUARED = 0.2f;
+            const float MIN_HEAD_CAMERA_SEPARATION_SQUARED = MIN_VIEW_BACK_FRONTS[0][1] * MIN_VIEW_BACK_FRONTS[0][1];
             if (glm::distance2(_views[0].origin, _views[1].origin) < MIN_HEAD_CAMERA_SEPARATION_SQUARED) {
                 // ... unless the first two are close enough to be considered the same
                 // in which case we only keep one of them

From d481f081bbf163086a1835e8095b5110e86a1092 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 10:29:38 -0700
Subject: [PATCH 40/73] Fix four bugs; truncate some logs

---
 .../hifi/commerce/purchases/PurchasedItem.qml |  5 +--
 .../qml/hifi/commerce/wallet/Wallet.qml       |  6 ---
 .../qml/hifi/commerce/wallet/WalletHome.qml   | 22 ----------
 scripts/modules/appUi.js                      | 41 ++++++++++++-------
 scripts/system/commerce/wallet.js             | 12 ++++++
 5 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index d13473af22..0828d86eff 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -47,8 +47,7 @@ Item {
     property string wornEntityID;
     property string upgradeUrl;
     property string upgradeTitle;
-    property bool updateAvailable: root.upgradeUrl !== "" && !root.isShowingMyItems;
-    property bool isShowingMyItems;
+    property bool updateAvailable: root.upgradeUrl !== "";
     property bool valid;
 
     property string originalStatusText;
@@ -231,7 +230,7 @@ Item {
 
                 Loader {
                     id: giftButton;
-                    visible: !root.isShowingMyItems;
+                    visible: root.itemEdition > 0;
                     sourceComponent: contextCardButton;
                     anchors.right: parent.right;
                     anchors.top: parent.top;
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index e1e58bf7c7..e17faef194 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -355,10 +355,6 @@ Rectangle {
                 if (msg.method === 'transactionHistory_usernameLinkClicked') {
                     userInfoViewer.url = msg.usernameLink;
                     userInfoViewer.visible = true;
-                } else if (msg.method === 'goToPurchases_fromWalletHome') {
-                    root.activeView = "walletInventory";
-                    walletInventory.isShowingMyItems = false;
-                    tabButtonsContainer.resetTabButtonColors();
                 } else {
                     sendToScript(msg);
                 }
@@ -630,7 +626,6 @@ Rectangle {
                 hoverEnabled: enabled;
                 onClicked: {
                     root.activeView = "walletInventory";
-                    walletInventory.isShowingMyItems = false;
                     tabButtonsContainer.resetTabButtonColors();
                 }
                 onEntered: parent.color = hifi.colors.blueHighlight;
@@ -961,7 +956,6 @@ Rectangle {
             Commerce.getWalletStatus();
         } else if (msg.referrer === 'purchases') {
             root.activeView = "walletInventory";
-            walletInventory.isShowingMyItems = false;
             tabButtonsContainer.resetTabButtonColors();
         } else if (msg.referrer === 'marketplace cta' || msg.referrer === 'mainPage') {
             sendToScript({method: 'goToMarketplaceMainPage', itemId: msg.referrer});
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index 246773ff07..d32017189e 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -179,28 +179,6 @@ Item {
             color: hifi.colors.baseGrayHighlight;
         }
 
-        RalewaySemiBold {
-            id: myPurchasesLink;
-            text: '<font color="#0093C5"><a href="#myPurchases">Inventory</a></font>';
-            // Anchors
-            anchors.top: parent.top;
-            anchors.topMargin: 26;
-            anchors.right: parent.right;
-            anchors.rightMargin: 20;
-            width: paintedWidth;
-            height: 30;
-            y: 4;
-            // Text size
-            size: 18;
-            // Style
-            color: hifi.colors.baseGrayHighlight;
-            horizontalAlignment: Text.AlignRight;
-
-            onLinkActivated: {
-                sendSignalToWallet({method: 'goToPurchases_fromWalletHome'});
-            }
-        }
-
         HifiModels.PSFListModel {
             id: transactionHistoryModel;
             property int lastPendingCount: 0;
diff --git a/scripts/modules/appUi.js b/scripts/modules/appUi.js
index c340dfecd2..e267293977 100644
--- a/scripts/modules/appUi.js
+++ b/scripts/modules/appUi.js
@@ -129,7 +129,9 @@ function AppUi(properties) {
                 }
                 that.isOpen = true;
             }
-        } else { // Not us.  Should we do something for type Home, Menu, and particularly Closed (meaning tablet hidden?
+        } else {
+            // A different screen is now visible, or the tablet has been closed.
+            // Tablet visibility is controlled separately by `tabletShownChanged()`
             that.wireEventBridge(false);
             if (that.isOpen) {
                 that.buttonActive(false);
@@ -139,12 +141,12 @@ function AppUi(properties) {
                 that.isOpen = false;
             }
         }
-        // console.debug(that.buttonName + " app reports: Tablet screen changed.\nNew screen type: " + type +
-        //    "\nNew screen URL: " + url + "\nCurrent app open status: " + that.isOpen + "\n");
     };
 
     // Overwrite with the given properties:
-    Object.keys(properties).forEach(function (key) { that[key] = properties[key]; });
+    Object.keys(properties).forEach(function (key) {
+        that[key] = properties[key];
+    });
 
     //
     // START Notification Handling
@@ -157,22 +159,20 @@ function AppUi(properties) {
         concatenatedServerResponse[i] = new Array();
     }
 
+    var MAX_LOG_LENGTH_CHARACTERS = 300;
     function requestCallback(error, response, optionalParams) {
         var indexOfRequest = optionalParams.indexOfRequest;
         var urlOfRequest = optionalParams.urlOfRequest;
 
         if (error || (response.status !== 'success')) {
             print("Error: unable to get", urlOfRequest, error || response.status);
-            that.notificationPollTimeout[indexOfRequest] = Script.setTimeout(
-                that.notificationPoll(indexOfRequest), that.notificationPollTimeoutMs[indexOfRequest]);
+            startNotificationTimer(indexOfRequest);
             return;
         }
 
         if (!that.notificationPollStopPaginatingConditionMet[indexOfRequest] ||
             that.notificationPollStopPaginatingConditionMet[indexOfRequest](response)) {
-            that.notificationPollTimeout[indexOfRequest] = Script.setTimeout(function () {
-                that.notificationPoll(indexOfRequest);
-            }, that.notificationPollTimeoutMs[indexOfRequest]);
+            startNotificationTimer(indexOfRequest);
 
             var notificationData;
             if (concatenatedServerResponse[indexOfRequest].length) {
@@ -181,7 +181,8 @@ function AppUi(properties) {
                 notificationData = that.notificationDataProcessPage[indexOfRequest](response);
             }
             console.debug(that.buttonName, that.notificationPollEndpoint[indexOfRequest],
-                'notification data for processing:', JSON.stringify(notificationData));
+                'truncated notification data for processing:',
+                JSON.stringify(notificationData).substring(0, MAX_LOG_LENGTH_CHARACTERS));
             that.notificationPollCallback[indexOfRequest](notificationData);
             that.notificationInitialCallbackMade[indexOfRequest] = true;
             currentDataPageToRetrieve[indexOfRequest] = 1;
@@ -199,15 +200,19 @@ function AppUi(properties) {
 
 
     var METAVERSE_BASE = Account.metaverseServerURL;
+    var MS_IN_SEC = 1000;
     that.notificationPoll = function (i) {
         if (!that.notificationPollEndpoint[i]) {
             return;
         }
 
-        // User is "appearing offline" or is offline
-        if (GlobalServices.findableBy === "none" || Account.username === "") {
-            that.notificationPollTimeout[i] = Script.setTimeout(
-                that.notificationPoll(i), that.notificationPollTimeoutMs[i]);
+        // User is "appearing offline" or is not logged in
+        if (GlobalServices.findableBy === "none" || Account.username === "Unknown user") {
+            // The notification polling will restart when the user changes their availability
+            // or when they log in, so it's not necessary to restart a timer here.
+            console.debug(that.buttonName + " Notifications: User is appearing offline or not logged in. " +
+                that.buttonName + " will poll for notifications when user logs in and has their availability " +
+                "set to not appear offline.");
             return;
         }
 
@@ -217,7 +222,7 @@ function AppUi(properties) {
         var currentTimestamp = new Date().getTime();
         var lastPollTimestamp = Settings.getValue(settingsKey, currentTimestamp);
         if (that.notificationPollCaresAboutSince[i]) {
-            url = url + "&since=" + lastPollTimestamp / 1000;
+            url = url + "&since=" + lastPollTimestamp / MS_IN_SEC;
         }
         Settings.setValue(settingsKey, currentTimestamp);
 
@@ -239,6 +244,12 @@ function AppUi(properties) {
         that.notificationPoll(i);
     }
 
+    function startNotificationTimer(indexOfRequest) {
+        that.notificationPollTimeout[indexOfRequest] = Script.setTimeout(function () {
+            that.notificationPoll(indexOfRequest);
+        }, that.notificationPollTimeoutMs[indexOfRequest]);
+    }
+
     function restartNotificationPoll() {
         for (var j = 0; j < that.notificationPollEndpoint.length; j++) {
             that.notificationInitialCallbackMade[j] = false;
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 2ae30b5b35..bc7bccd94f 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -401,6 +401,14 @@ function openMarketplace(optionalItemOrUrl) {
     ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
 }
 
+function setCertificateInfo(itemCertificateId) {
+    ui.tablet.sendToQml({
+        method: 'inspectionCertificate_setCertificateId',
+        entityId: "",
+        certificateId: itemCertificateId
+    });
+}
+
 // Function Name: fromQml()
 //
 // Description:
@@ -521,6 +529,9 @@ function fromQml(message) {
             openMarketplace(itemId);
         }
         break;
+    case 'purchases_itemCertificateClicked':
+        setCertificateInfo(message.itemCertificateId);
+        break;
     case 'clearShouldShowDotHistory':
         shouldShowDotHistory = false;
         ui.messagesWaiting(shouldShowDotUpdates || shouldShowDotHistory);
@@ -698,6 +709,7 @@ function off() {
         Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
         triggerMapping.disable();
         triggerPressMapping.disable();
+        isWired = false;
     }
 
     if (isUpdateOverlaysWired) {

From 4a56f769e5b133e2ce8c67cf87274939a732ffcb Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 11:04:59 -0700
Subject: [PATCH 41/73] Re-add some code I shouldn't have removed

---
 scripts/system/html/js/marketplacesInject.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index eda37c06b7..db433c5058 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -264,6 +264,13 @@
                 "font-weight": "600",
                 "line-height": "34px"
             });
+
+            if (parseInt(cost) > 0) {
+                priceElement.css({ "width": "auto" });
+                priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
+                    'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
+                priceElement.css({ "min-width": priceElement.width() + 30 });
+            }
         });
 
         // change pricing to GET/BUY on button hover
@@ -382,6 +389,9 @@
                 var cost = $('.item-cost').text();
                 var costInt = parseInt(cost, 10);
                 var availability = $.trim($('.item-availability').text());
+                if (limitedCommerce && (costInt > 0)) {
+                    availability = '';
+                }
                 if (availability === 'available') {
                     purchaseButton.css({
                         "background": "linear-gradient(#00b4ef, #0093C5)",

From 3e2d6c341b6b2cfcf142664d99b3400bff01f8e5 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 1 Nov 2018 11:45:25 -0700
Subject: [PATCH 42/73] placeholder svgs

---
 .../tablet-icons/{wallet-a-msg.svg => inventory-a-msg.svg}     | 0
 interface/resources/icons/tablet-icons/inventory-a.svg         | 3 +++
 .../tablet-icons/{wallet-i-msg.svg => inventory-i-msg.svg}     | 0
 .../icons/tablet-icons/{wallet-i.svg => inventory-i.svg}       | 0
 interface/resources/icons/tablet-icons/wallet-a.svg            | 1 -
 5 files changed, 3 insertions(+), 1 deletion(-)
 rename interface/resources/icons/tablet-icons/{wallet-a-msg.svg => inventory-a-msg.svg} (100%)
 create mode 100644 interface/resources/icons/tablet-icons/inventory-a.svg
 rename interface/resources/icons/tablet-icons/{wallet-i-msg.svg => inventory-i-msg.svg} (100%)
 rename interface/resources/icons/tablet-icons/{wallet-i.svg => inventory-i.svg} (100%)
 delete mode 100644 interface/resources/icons/tablet-icons/wallet-a.svg

diff --git a/interface/resources/icons/tablet-icons/wallet-a-msg.svg b/interface/resources/icons/tablet-icons/inventory-a-msg.svg
similarity index 100%
rename from interface/resources/icons/tablet-icons/wallet-a-msg.svg
rename to interface/resources/icons/tablet-icons/inventory-a-msg.svg
diff --git a/interface/resources/icons/tablet-icons/inventory-a.svg b/interface/resources/icons/tablet-icons/inventory-a.svg
new file mode 100644
index 0000000000..8b6f34eaa3
--- /dev/null
+++ b/interface/resources/icons/tablet-icons/inventory-a.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="26" viewBox="0 0 22 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="black" stroke-width="2" stroke-linejoin="round"/>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/wallet-i-msg.svg b/interface/resources/icons/tablet-icons/inventory-i-msg.svg
similarity index 100%
rename from interface/resources/icons/tablet-icons/wallet-i-msg.svg
rename to interface/resources/icons/tablet-icons/inventory-i-msg.svg
diff --git a/interface/resources/icons/tablet-icons/wallet-i.svg b/interface/resources/icons/tablet-icons/inventory-i.svg
similarity index 100%
rename from interface/resources/icons/tablet-icons/wallet-i.svg
rename to interface/resources/icons/tablet-icons/inventory-i.svg
diff --git a/interface/resources/icons/tablet-icons/wallet-a.svg b/interface/resources/icons/tablet-icons/wallet-a.svg
deleted file mode 100644
index 50ea64848f..0000000000
--- a/interface/resources/icons/tablet-icons/wallet-a.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve"><g><path d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9V25.5   c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11V70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5v-1.5c0-2.8,2.2-5,5-5h13.3   c1.1,0,2,0.9,2,2V51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81   v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"></path></g></svg>
\ No newline at end of file

From d6477993a160e7f8c667849a645c523260c0173b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 13:08:00 -0700
Subject: [PATCH 43/73] Make it work better with the tablet

---
 interface/src/Menu.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 3636a2f45a..16e8af5683 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -268,9 +268,13 @@ Menu::Menu() {
     // Settings > Security...
     action = addActionToQMenuAndActionHash(settingsMenu, "Security...");
     connect(action, &QAction::triggered, [] {
-        auto tablet = dynamic_cast<TabletProxy*>(
-            DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
-        tablet->loadQMLSource(QString("hifi/dialogs/security/Security.qml"));
+		auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+		auto hmd = DependencyManager::get<HMDScriptingInterface>();
+		tablet->pushOntoStack("hifi/dialogs/security/Security.qml");
+
+		if (!hmd->getShouldShowTablet()) {
+			hmd->toggleShouldShowTablet();
+		}
     });
 
     // Settings > Developer Menu

From 0a15e94fe4de1088806af17489859066c7856171 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 13:27:31 -0700
Subject: [PATCH 44/73] New colors

---
 .../resources/qml/hifi/dialogs/security/Security.qml      | 8 +++-----
 .../qml/hifi/dialogs/security/SecurityImageChange.qml     | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 3f4d17e838..8baff0ac13 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -19,13 +19,11 @@ import "qrc:////qml//controls-uit" as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon
 
-// references XXX from root context
-
 Rectangle {
     HifiStylesUit.HifiConstants { id: hifi; }
 
     id: root;
-    color: hifi.colors.darkGray;
+    color: hifi.colors.baseGray;
     
     property string title: "Security Settings";
     property bool walletSetUp;
@@ -163,7 +161,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                height: 70;
+                height: 55;
                 color: hifi.colors.baseGrayHighlight;
 
                 HifiStylesUit.RalewaySemiBold {
@@ -254,7 +252,7 @@ Rectangle {
                 anchors.top: parent.top;
                 anchors.left: parent.left;
                 anchors.right: parent.right;
-                height: 70;
+                height: 55;
                 color: hifi.colors.baseGrayHighlight;
 
                 HifiStylesUit.RalewaySemiBold {
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
index 0007b98291..96d75e340b 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
@@ -23,7 +23,7 @@ Rectangle {
     HifiStylesUit.HifiConstants { id: hifi; }
 
     id: root;
-    color: hifi.colors.darkGray;
+    color: hifi.colors.baseGray;
     property bool justSubmitted: false;
 
     Connections {

From 8256bfbc554b06d2d752f55403f2239729801d6c Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Thu, 1 Nov 2018 15:20:50 -0700
Subject: [PATCH 45/73] icons

---
 .../icons/tablet-icons/inventory-a-msg.svg    | 10 ++---
 .../icons/tablet-icons/inventory-i-msg.svg    | 18 ++-------
 .../icons/tablet-icons/inventory-i.svg        | 17 ++-------
 .../qml/hifi/commerce/wallet/Wallet.qml       | 38 +++++++++++--------
 .../commerce/wallet/images/items-tab-a.svg    |  8 ++++
 5 files changed, 40 insertions(+), 51 deletions(-)
 create mode 100644 interface/resources/qml/hifi/commerce/wallet/images/items-tab-a.svg

diff --git a/interface/resources/icons/tablet-icons/inventory-a-msg.svg b/interface/resources/icons/tablet-icons/inventory-a-msg.svg
index d51c3e99a2..794bd1e414 100644
--- a/interface/resources/icons/tablet-icons/inventory-a-msg.svg
+++ b/interface/resources/icons/tablet-icons/inventory-a-msg.svg
@@ -1,6 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
-<style type="text/css">
-	.st1{fill:#EF3B4E;}
-</style>
-<circle class="st1" cx="84.6" cy="11.5" r="10.75"/>
-<g><path d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9V25.5   c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11V70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5v-1.5c0-2.8,2.2-5,5-5h13.3   c1.1,0,2,0.9,2,2V51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81   v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"></path></g></svg>
\ No newline at end of file
+<svg width="22" height="26" fill="none" version="1.1" viewBox="0 0 22 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="#000" stroke-linejoin="round" stroke-width="2"/>
+ <circle class="st1" cx="19.407" cy="2.5881" r="2.5846" fill="#ef3b4e" stroke-width=".24043"/>
+</svg>
diff --git a/interface/resources/icons/tablet-icons/inventory-i-msg.svg b/interface/resources/icons/tablet-icons/inventory-i-msg.svg
index 676f97a966..35d4fb54ae 100644
--- a/interface/resources/icons/tablet-icons/inventory-i-msg.svg
+++ b/interface/resources/icons/tablet-icons/inventory-i-msg.svg
@@ -1,16 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#EF3B4E;}
-</style>
-<circle class="st1" cx="84.6" cy="11.5" r="10.75"/>
-<g>
-	<path class="st0" d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9
-		V25.5c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11C2.4,25.5,2.4,70.5,2.4,70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5
-		v-1.5c0-2.8,2.2-5,5-5h13.3c1.1,0,2,0.9,2,2L87.6,51.8L87.6,51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7
-		c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"/>
-</g>
+<svg width="22" height="26" fill="none" version="1.1" viewBox="0 0 22 26" xmlns="http://www.w3.org/2000/svg">
+ <path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <circle class="st1" cx="19.41" cy="2.5828" r="2.5846" fill="#ef3b4e" stroke-width=".24043"/>
 </svg>
diff --git a/interface/resources/icons/tablet-icons/inventory-i.svg b/interface/resources/icons/tablet-icons/inventory-i.svg
index 4e27e41b44..071fabce88 100644
--- a/interface/resources/icons/tablet-icons/inventory-i.svg
+++ b/interface/resources/icons/tablet-icons/inventory-i.svg
@@ -1,14 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M2.4,70.5c0,6.1,4.9,11,11,11H76c6.1,0,11-4.9,11-11V59.6c3.7-0.7,6.6-3.9,6.6-7.9v-7.5c0-3.9-2.8-7.2-6.6-7.9
-		V25.5c0-6.1-4.9-11-11-11H13.4c-6.1,0-11,4.9-11,11C2.4,25.5,2.4,70.5,2.4,70.5z M87.6,51.8c0,1.1-0.9,2-2,2H72.2c-2.8,0-5-2.2-5-5
-		v-1.5c0-2.8,2.2-5,5-5h13.3c1.1,0,2,0.9,2,2L87.6,51.8L87.6,51.8z M8.4,25.5c0-2.8,2.2-5,5-5H76c2.8,0,5,2.2,5,5v10.7h-8.7
-		c-6.1,0-11,4.9-11,11v1.5c0,6.1,4.9,11,11,11H81v10.7c0,2.8-2.2,5-5,5H13.4c-2.8,0-5-2.2-5-5V25.5z"/>
-</g>
-</svg>
+<svg width="22" height="26" viewBox="0 0 22 26" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 7L11 1L21 7M1 7L11 13M1 7V19L11 25M11 13L21 7M11 13V25M21 7V19L11 25" stroke="white" stroke-width="2" stroke-linejoin="round"/>
+</svg>
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 4124200535..6383677b84 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -126,16 +126,19 @@ Rectangle {
         anchors.top: parent.top;
 
         // Wallet icon
-        HiFiGlyphs {
+        Image {
             id: walletIcon;
-            text: hifi.glyphs.wallet;
-            // Size
-            size: parent.height * 0.8;
-            // Anchors
+            source: "../../../../icons/tablet-icons/inventory-a.svg";
+            height: parent.height * 0.5;
+            width: walletIcon.height;
             anchors.left: parent.left;
             anchors.leftMargin: 8;
             anchors.verticalCenter: parent.verticalCenter;
-            // Style
+            visible: false; // When we use a white .svg instead of a glyph with color property, we set to invisible and use the following ColorOverlay.
+        }
+        ColorOverlay {
+            anchors.fill: walletIcon;
+            source: walletIcon;
             color: hifi.colors.blueHighlight;
         }
 
@@ -148,7 +151,7 @@ Rectangle {
             // Anchors
             anchors.top: parent.top;
             anchors.left: walletIcon.right;
-            anchors.leftMargin: 4;
+            anchors.leftMargin: 6;
             anchors.bottom: parent.bottom;
             width: paintedWidth;
             // Style
@@ -575,16 +578,19 @@ Rectangle {
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         
-            HiFiGlyphs {
+            Image {
                 id: exchangeMoneyTabIcon;
-                text: hifi.glyphs.home2;
-                // Size
-                size: 50;
-                // Anchors
+                source: "images/items-tab-a.svg";
+                height: 25;
+                width: exchangeMoneyTabIcon.height;
                 anchors.horizontalCenter: parent.horizontalCenter;
                 anchors.top: parent.top;
-                anchors.topMargin: -2;
-                // Style
+                anchors.topMargin: 10;
+                visible: false; // When we use a white .svg instead of a glyph with color property, we set to invisible and use the following ColorOverlay.
+            }
+            ColorOverlay {
+                anchors.fill: exchangeMoneyTabIcon;
+                source: exchangeMoneyTabIcon;
                 color: root.activeView === "walletInventory" || inventoryTabMouseArea.containsMouse ? hifi.colors.white : hifi.colors.blueHighlight;
             }
 
@@ -592,9 +598,9 @@ Rectangle {
                 id: exchangeMoneyMessagesWaitingLight;
                 visible: parent.messagesWaiting;
                 anchors.right: exchangeMoneyTabIcon.left;
-                anchors.rightMargin: -4;
+                anchors.rightMargin: 10;
                 anchors.top: exchangeMoneyTabIcon.top;
-                anchors.topMargin: 16;
+                anchors.topMargin: 4;
                 height: 10;
                 width: height;
                 radius: height/2;
diff --git a/interface/resources/qml/hifi/commerce/wallet/images/items-tab-a.svg b/interface/resources/qml/hifi/commerce/wallet/images/items-tab-a.svg
new file mode 100644
index 0000000000..7474f4ed57
--- /dev/null
+++ b/interface/resources/qml/hifi/commerce/wallet/images/items-tab-a.svg
@@ -0,0 +1,8 @@
+<svg width="26" height="24" viewBox="0 0 26 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<line x1="6" y1="2" x2="26" y2="2" stroke="white" stroke-width="4"/>
+<line x1="1.74846e-07" y1="2" x2="4" y2="2" stroke="white" stroke-width="4"/>
+<line x1="6" y1="12" x2="26" y2="12" stroke="white" stroke-width="4"/>
+<line x1="1.74846e-07" y1="12" x2="4" y2="12" stroke="white" stroke-width="4"/>
+<line x1="6" y1="22" x2="26" y2="22" stroke="white" stroke-width="4"/>
+<line x1="1.74846e-07" y1="22" x2="4" y2="22" stroke="white" stroke-width="4"/>
+</svg>

From 1f8dde67568f80e70cc888200535f2442cc1792c Mon Sep 17 00:00:00 2001
From: Roxanne Skelly <roxanne@highfidelity.io>
Date: Thu, 1 Nov 2018 15:37:16 -0700
Subject: [PATCH 46/73] Transaction string was assuming items given to the
 marketplace/highfidelity were Gifts and was reporting them as such. Items
 given to the marketplace are in exchange for updates, and the memo indicates
 such.

---
 interface/src/commerce/Ledger.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp
index 67303f2a9b..60cd96c0ca 100644
--- a/interface/src/commerce/Ledger.cpp
+++ b/interface/src/commerce/Ledger.cpp
@@ -219,7 +219,11 @@ QString transactionString(const QJsonObject& valueObject) {
         if (!message.isEmpty()) {
             result += QString("<br>with memo: <i>\"%1\"</i>").arg(message);
         }
-    } else if (sentMoney <= 0 && receivedMoney <= 0 && (sentCerts > 0 || receivedCerts > 0) && !KNOWN_USERS.contains(valueObject["sender_name"].toString())) {
+    } else if (sentMoney <= 0 && receivedMoney <= 0 && 
+               (sentCerts > 0 || receivedCerts > 0) && 
+               !KNOWN_USERS.contains(valueObject["sender_name"].toString()) &&
+               !KNOWN_USERS.contains(valueObject["recipient_name"].toString())
+        ) {
         // this is a non-HFC asset transfer.
         if (sentCerts > 0) {
             QString recipient = userLink(valueObject["recipient_name"].toString(), valueObject["place_name"].toString());

From cbca77b12fa3f87d70dfc22de92a97b875c77257 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Thu, 1 Nov 2018 17:17:48 -0700
Subject: [PATCH 47/73] Rename HFMGeometry to HFMModel and adjust related
 variables

---
 .../src/avatars/ScriptableAvatar.cpp          |   6 +-
 interface/src/ModelPackager.cpp               |  34 +--
 interface/src/ModelPackager.h                 |   6 +-
 interface/src/ModelPropertiesDialog.cpp       |  20 +-
 interface/src/ModelPropertiesDialog.h         |   4 +-
 interface/src/avatar/MyAvatar.cpp             |  14 +-
 interface/src/avatar/MySkeletonModel.cpp      |  14 +-
 interface/src/raypick/CollisionPick.cpp       |  14 +-
 interface/src/ui/overlays/ModelOverlay.cpp    |  14 +-
 libraries/animation/src/AnimClip.cpp          |  10 +-
 libraries/animation/src/AnimSkeleton.cpp      |   6 +-
 libraries/animation/src/AnimSkeleton.h        |   2 +-
 libraries/animation/src/AnimationCache.cpp    |  24 +-
 libraries/animation/src/AnimationCache.h      |   8 +-
 libraries/animation/src/Rig.cpp               |  68 ++---
 libraries/animation/src/Rig.h                 |   6 +-
 .../src/avatars-renderer/Avatar.cpp           |   6 +-
 .../src/avatars-renderer/SkeletonModel.cpp    |  46 ++--
 .../src/avatars-renderer/SkeletonModel.h      |   4 +-
 libraries/baking/src/FBXBaker.cpp             |   6 +-
 libraries/baking/src/FBXBaker.h               |   2 +-
 libraries/baking/src/OBJBaker.cpp             |  20 +-
 libraries/baking/src/OBJBaker.h               |   4 +-
 .../src/RenderableModelEntityItem.cpp         |  24 +-
 libraries/fbx/src/FBX.h                       |  14 +-
 libraries/fbx/src/FBXReader.cpp               | 234 +++++++++---------
 libraries/fbx/src/FBXReader.h                 |  12 +-
 libraries/fbx/src/GLTFReader.cpp              | 112 ++++-----
 libraries/fbx/src/GLTFReader.h                |   8 +-
 libraries/fbx/src/OBJReader.cpp               |  70 +++---
 libraries/fbx/src/OBJReader.h                 |   6 +-
 .../src/model-networking/ModelCache.cpp       |  40 +--
 .../src/model-networking/ModelCache.h         |   8 +-
 .../render-utils/src/CauterizedModel.cpp      |  20 +-
 .../render-utils/src/MeshPartPayload.cpp      |   4 +-
 libraries/render-utils/src/Model.cpp          |  90 +++----
 libraries/render-utils/src/Model.h            |   8 +-
 .../render-utils/src/SoftAttachmentModel.cpp  |   6 +-
 tests-manual/gpu/src/TestFbx.cpp              |  10 +-
 tests-manual/gpu/src/TestFbx.h                |   2 +-
 .../src/AnimInverseKinematicsTests.cpp        |  24 +-
 tools/skeleton-dump/src/SkeletonDumpApp.cpp   |   2 +-
 tools/vhacd-util/src/VHACDUtil.cpp            |  34 +--
 tools/vhacd-util/src/VHACDUtil.h              |   8 +-
 tools/vhacd-util/src/VHACDUtilApp.cpp         |  10 +-
 tools/vhacd-util/src/VHACDUtilApp.h           |   2 +-
 46 files changed, 543 insertions(+), 543 deletions(-)

diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
index 385f94d9f3..51038a782f 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -84,7 +84,7 @@ void ScriptableAvatar::update(float deltatime) {
     // Run animation
     if (_animation && _animation->isLoaded() && _animation->getFrames().size() > 0 && !_bind.isNull() && _bind->isLoaded()) {
         if (!_animSkeleton) {
-            _animSkeleton = std::make_shared<AnimSkeleton>(_bind->getGeometry());
+            _animSkeleton = std::make_shared<AnimSkeleton>(_bind->getHFMModel());
         }
         float currentFrame = _animationDetails.currentFrame + deltatime * _animationDetails.fps;
         if (_animationDetails.loop || currentFrame < _animationDetails.lastFrame) {
@@ -93,7 +93,7 @@ void ScriptableAvatar::update(float deltatime) {
             }
             _animationDetails.currentFrame = currentFrame;
 
-            const QVector<HFMJoint>& modelJoints = _bind->getGeometry().joints;
+            const QVector<HFMJoint>& modelJoints = _bind->getHFMModel().joints;
             QStringList animationJointNames = _animation->getJointNames();
 
             const int nJoints = modelJoints.size();
@@ -113,7 +113,7 @@ void ScriptableAvatar::update(float deltatime) {
                 const QString& name = animationJointNames[i];
                 // As long as we need the model preRotations anyway, let's get the jointIndex from the bind skeleton rather than
                 // trusting the .fst (which is sometimes not updated to match changes to .fbx).
-                int mapping = _bind->getGeometry().getJointIndex(name);
+                int mapping = _bind->getHFMModel().getJointIndex(name);
                 if (mapping != -1 && !_maskedJoints.contains(name)) {
 
                     AnimPose floorPose = composeAnimPose(modelJoints[mapping], floorFrame.rotations[i], floorFrame.translations[i] * UNIT_SCALE);
diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 0b2846006b..f3a69bbad2 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -109,10 +109,10 @@ bool ModelPackager::loadModel() {
         qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();
         QByteArray fbxContents = fbx.readAll();
 
-        _geometry.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));
+        _model.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));
 
         // make sure we have some basic mappings
-        populateBasicMapping(_mapping, _fbxInfo.filePath(), *_geometry);
+        populateBasicMapping(_mapping, _fbxInfo.filePath(), *_model);
     } catch (const QString& error) {
         qCDebug(interfaceapp) << "Error reading " << _fbxInfo.filePath() << ": " << error;
         return false;
@@ -122,7 +122,7 @@ bool ModelPackager::loadModel() {
 
 bool ModelPackager::editProperties() {
     // open the dialog to configure the rest
-    ModelPropertiesDialog properties(_modelType, _mapping, _modelFile.path(), *_geometry);
+    ModelPropertiesDialog properties(_modelType, _mapping, _modelFile.path(), *_model);
     if (properties.exec() == QDialog::Rejected) {
         return false;
     }
@@ -235,18 +235,18 @@ bool ModelPackager::zipModel() {
     return true;
 }
 
-void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry) {
+void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& model) {
 
     bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
 
     // mixamo files - in the event that a mixamo file was edited by some other tool, it's likely the applicationName will
     // be rewritten, so we detect the existence of several different blendshapes which indicate we're likely a mixamo file
-    bool likelyMixamoFile = geometry.applicationName == "mixamo.com" ||
-                            (geometry.blendshapeChannelNames.contains("BrowsDown_Right") &&
-                             geometry.blendshapeChannelNames.contains("MouthOpen") &&
-                             geometry.blendshapeChannelNames.contains("Blink_Left") &&
-                             geometry.blendshapeChannelNames.contains("Blink_Right") &&
-                             geometry.blendshapeChannelNames.contains("Squint_Right"));
+    bool likelyMixamoFile = model.applicationName == "mixamo.com" ||
+                            (model.blendshapeChannelNames.contains("BrowsDown_Right") &&
+                             model.blendshapeChannelNames.contains("MouthOpen") &&
+                             model.blendshapeChannelNames.contains("Blink_Left") &&
+                             model.blendshapeChannelNames.contains("Blink_Right") &&
+                             model.blendshapeChannelNames.contains("Squint_Right"));
     
     if (!mapping.contains(NAME_FIELD)) {
         mapping.insert(NAME_FIELD, QFileInfo(filename).baseName());
@@ -268,15 +268,15 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
     }
     QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
     if (!joints.contains("jointEyeLeft")) {
-        joints.insert("jointEyeLeft", geometry.jointIndices.contains("jointEyeLeft") ? "jointEyeLeft" :
-                      (geometry.jointIndices.contains("EyeLeft") ? "EyeLeft" : "LeftEye"));
+        joints.insert("jointEyeLeft", model.jointIndices.contains("jointEyeLeft") ? "jointEyeLeft" :
+                      (model.jointIndices.contains("EyeLeft") ? "EyeLeft" : "LeftEye"));
     }
     if (!joints.contains("jointEyeRight")) {
-        joints.insert("jointEyeRight", geometry.jointIndices.contains("jointEyeRight") ? "jointEyeRight" :
-                      geometry.jointIndices.contains("EyeRight") ? "EyeRight" : "RightEye");
+        joints.insert("jointEyeRight", model.jointIndices.contains("jointEyeRight") ? "jointEyeRight" :
+                      model.jointIndices.contains("EyeRight") ? "EyeRight" : "RightEye");
     }
     if (!joints.contains("jointNeck")) {
-        joints.insert("jointNeck", geometry.jointIndices.contains("jointNeck") ? "jointNeck" : "Neck");
+        joints.insert("jointNeck", model.jointIndices.contains("jointNeck") ? "jointNeck" : "Neck");
     }
     
     if (isBodyType) {
@@ -296,7 +296,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
     
     if (!joints.contains("jointHead")) {
         const char* topName = likelyMixamoFile ? "HeadTop_End" : "HeadEnd";
-        joints.insert("jointHead", geometry.jointIndices.contains(topName) ? topName : "Head");
+        joints.insert("jointHead", model.jointIndices.contains(topName) ? topName : "Head");
     }
 
     mapping.insert(JOINT_FIELD, joints);
@@ -370,7 +370,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
 
 void ModelPackager::listTextures() {
     _textures.clear();
-    foreach (const HFMMaterial mat, _geometry->materials) {
+    foreach (const HFMMaterial mat, _model->materials) {
         if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&
             !_textures.contains(mat.albedoTexture.filename)) {
             _textures << mat.albedoTexture.filename;
diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index b68d9e746d..2ec629a363 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -19,7 +19,7 @@
 
 #include "ui/ModelsBrowser.h"
 
-class HFMGeometry;
+class HFMModel;
 
 class ModelPackager : public QObject {
 public:
@@ -32,7 +32,7 @@ private:
     bool editProperties();
     bool zipModel();
     
-    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry);
+    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& model);
     
     void listTextures();
     bool copyTextures(const QString& oldDir, const QDir& newDir);
@@ -44,7 +44,7 @@ private:
     QString _scriptDir;
 
     QVariantHash _mapping;
-    std::unique_ptr<HFMGeometry> _geometry;
+    std::unique_ptr<HFMModel> _model;
     QStringList _textures;
     QStringList _scripts;
 };
diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index dcda85d117..0b1638a5bc 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -27,11 +27,11 @@
 
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                                             const QString& basePath, const HFMGeometry& geometry) :
+                                             const QString& basePath, const HFMModel& model) :
 _modelType(modelType),
 _originalMapping(originalMapping),
 _basePath(basePath),
-_geometry(geometry)
+_model(model)
 {
     setWindowTitle("Set Model Properties");
 
@@ -108,8 +108,8 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
 
     // update the joint indices
     QVariantHash jointIndices;
-    for (int i = 0; i < _geometry.joints.size(); i++) {
-        jointIndices.insert(_geometry.joints.at(i).name, QString::number(i));
+    for (int i = 0; i < _model.joints.size(); i++) {
+        jointIndices.insert(_model.joints.at(i).name, QString::number(i));
     }
     mapping.insert(JOINT_INDEX_FIELD, jointIndices);
 
@@ -118,10 +118,10 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
         if (_modelType == FSTReader::ATTACHMENT_MODEL) {
             glm::vec3 pivot;
             if (_pivotAboutCenter->isChecked()) {
-                pivot = (_geometry.meshExtents.minimum + _geometry.meshExtents.maximum) * 0.5f;
+                pivot = (_model.meshExtents.minimum + _model.meshExtents.maximum) * 0.5f;
 
             } else if (_pivotJoint->currentIndex() != 0) {
-                pivot = extractTranslation(_geometry.joints.at(_pivotJoint->currentIndex() - 1).transform);
+                pivot = extractTranslation(_model.joints.at(_pivotJoint->currentIndex() - 1).transform);
             }
             mapping.insert(TRANSLATION_X_FIELD, -pivot.x * (float)_scale->value() + (float)_translationX->value());
             mapping.insert(TRANSLATION_Y_FIELD, -pivot.y * (float)_scale->value() + (float)_translationY->value());
@@ -191,7 +191,7 @@ void ModelPropertiesDialog::reset() {
             }
             foreach (const QVariant& joint, _originalMapping.values(FREE_JOINT_FIELD)) {
                 QString jointName = joint.toString();
-                if (_geometry.jointIndices.contains(jointName)) {
+                if (_model.jointIndices.contains(jointName)) {
                     createNewFreeJoint(jointName);
                 }
             }
@@ -249,8 +249,8 @@ QComboBox* ModelPropertiesDialog::createJointBox(bool withNone) const {
     if (withNone) {
         box->addItem("(none)");
     }
-    foreach (const HFMJoint& joint, _geometry.joints) {
-        if (joint.isSkeletonJoint || !_geometry.hasSkeletonJoints) {
+    foreach (const HFMJoint& joint, _model.joints) {
+        if (joint.isSkeletonJoint || !_model.hasSkeletonJoints) {
             box->addItem(joint.name);
         }
     }
@@ -266,7 +266,7 @@ QDoubleSpinBox* ModelPropertiesDialog::createTranslationBox() const {
 }
 
 void ModelPropertiesDialog::insertJointMapping(QVariantHash& joints, const QString& joint, const QString& name) const {
-    if (_geometry.jointIndices.contains(name)) {
+    if (_model.jointIndices.contains(name)) {
         joints.insert(joint, name);
     } else {
         joints.remove(joint);
diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h
index d1a020bec3..b979768a2d 100644
--- a/interface/src/ModelPropertiesDialog.h
+++ b/interface/src/ModelPropertiesDialog.h
@@ -30,7 +30,7 @@ class ModelPropertiesDialog : public QDialog {
     
 public:
     ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                          const QString& basePath, const HFMGeometry& geometry);
+                          const QString& basePath, const HFMModel& model);
     
     QVariantHash getMapping() const;
     
@@ -50,7 +50,7 @@ private:
     FSTReader::ModelType _modelType;
     QVariantHash _originalMapping;
     QString _basePath;
-    HFMGeometry _geometry;
+    HFMModel _model;
     QLineEdit* _name = nullptr;
     QPushButton* _textureDirectory = nullptr;
     QPushButton* _scriptDirectory = nullptr;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index b3a66f70b8..8d47591d40 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -155,8 +155,8 @@ MyAvatar::MyAvatar(QThread* thread) :
     });
     connect(_skeletonModel.get(), &Model::rigReady, this, [this]() {
         if (_shouldLoadScripts) {
-            auto geometry = getSkeletonModel()->getHFMGeometry();
-            qApp->loadAvatarScripts(geometry.scripts);
+            auto hfmModel = getSkeletonModel()->getHFMModel();
+            qApp->loadAvatarScripts(hfmModel.scripts);
             _shouldLoadScripts = false;
         }
                 // Load and convert old attachments to avatar entities
@@ -2429,10 +2429,10 @@ void MyAvatar::attachmentDataToEntityProperties(const AttachmentData& data, Enti
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
     if (_skeletonModel->isLoaded()) {
-        neckJointIndex = _skeletonModel->getHFMGeometry().neckJointIndex;
+        neckJointIndex = _skeletonModel->getHFMModel().neckJointIndex;
     }
     if (neckJointIndex == -1) {
-        neckJointIndex = (_skeletonModel->getHFMGeometry().headJointIndex - 1);
+        neckJointIndex = (_skeletonModel->getHFMModel().headJointIndex - 1);
         if (neckJointIndex < 0) {
             // return if the head is not even there. can't cauterize!!
             return;
@@ -2592,11 +2592,11 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
         if (_skeletonModel && _skeletonModel->isLoaded()) {
             const Rig& rig = _skeletonModel->getRig();
-            const HFMGeometry& geometry = _skeletonModel->getHFMGeometry();
+            const HFMModel& hfmModel = _skeletonModel->getHFMModel();
             for (int i = 0; i < rig.getJointStateCount(); i++) {
                 AnimPose jointPose;
                 rig.getAbsoluteJointPoseInRigFrame(i, jointPose);
-                const HFMJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
+                const HFMJointShapeInfo& shapeInfo = hfmModel.joints[i].shapeInfo;
                 const AnimPose pose = rigToWorldPose * jointPose;
                 for (size_t j = 0; j < shapeInfo.debugLines.size() / 2; j++) {
                     glm::vec3 pointA = pose.xformPoint(shapeInfo.debugLines[2 * j]);
@@ -4012,7 +4012,7 @@ float MyAvatar::getSitStandStateChange() const {
 }
 
 QVector<QString> MyAvatar::getScriptUrls() {
-    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getHFMGeometry().scripts : QVector<QString>();
+    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getHFMModel().scripts : QVector<QString>();
     return scripts;
 }
 
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index 3ec40d372b..2a21f78b21 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -90,7 +90,7 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
 
 // Called within Model::simulate call, below.
 void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
 
     Head* head = _owningAvatar->getHead();
 
@@ -268,19 +268,19 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     // pass detailed torso k-dops to rig.
     int hipsJoint = _rig.indexOfJoint("Hips");
     if (hipsJoint >= 0) {
-        params.hipsShapeInfo = geometry.joints[hipsJoint].shapeInfo;
+        params.hipsShapeInfo = hfmModel.joints[hipsJoint].shapeInfo;
     }
     int spineJoint = _rig.indexOfJoint("Spine");
     if (spineJoint >= 0) {
-        params.spineShapeInfo = geometry.joints[spineJoint].shapeInfo;
+        params.spineShapeInfo = hfmModel.joints[spineJoint].shapeInfo;
     }
     int spine1Joint = _rig.indexOfJoint("Spine1");
     if (spine1Joint >= 0) {
-        params.spine1ShapeInfo = geometry.joints[spine1Joint].shapeInfo;
+        params.spine1ShapeInfo = hfmModel.joints[spine1Joint].shapeInfo;
     }
     int spine2Joint = _rig.indexOfJoint("Spine2");
     if (spine2Joint >= 0) {
-        params.spine2ShapeInfo = geometry.joints[spine2Joint].shapeInfo;
+        params.spine2ShapeInfo = hfmModel.joints[spine2Joint].shapeInfo;
     }
 
     _rig.updateFromControllerParameters(params, deltaTime);
@@ -300,8 +300,8 @@ void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     eyeParams.eyeSaccade = head->getSaccade();
     eyeParams.modelRotation = getRotation();
     eyeParams.modelTranslation = getTranslation();
-    eyeParams.leftEyeJointIndex = geometry.leftEyeJointIndex;
-    eyeParams.rightEyeJointIndex = geometry.rightEyeJointIndex;
+    eyeParams.leftEyeJointIndex = hfmModel.leftEyeJointIndex;
+    eyeParams.rightEyeJointIndex = hfmModel.rightEyeJointIndex;
 
     _rig.updateFromEyeParameters(eyeParams);
 
diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp
index e8a53aa9b6..2b75946e28 100644
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@@ -131,7 +131,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const HFMGeometry& collisionGeometry = resource->getHFMGeometry();
+        const HFMModel& collisionModel = resource->getHFMModel();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -139,7 +139,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
 
         // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
         // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
-        foreach (const HFMMesh& mesh, collisionGeometry.meshes) {
+        foreach (const HFMMesh& mesh, collisionModel.meshes) {
             // each meshPart is a convex hull
             foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 pointCollection.push_back(QVector<glm::vec3>());
@@ -206,7 +206,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / resource->getHFMGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / resource->getHFMModel().getUnscaledMeshExtents().size();
         // multiply each point by scale
         for (int32_t i = 0; i < pointCollection.size(); i++) {
             for (int32_t j = 0; j < pointCollection[i].size(); j++) {
@@ -216,11 +216,11 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         }
         shapeInfo.setParams(type, dimensions, resource->getURL().toString());
     } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
-        const HFMGeometry& hfmGeometry = resource->getHFMGeometry();
-        int numHFMMeshes = hfmGeometry.meshes.size();
+        const HFMModel& hfmModel = resource->getHFMModel();
+        int numHFMMeshes = hfmModel.meshes.size();
         int totalNumVertices = 0;
         for (int i = 0; i < numHFMMeshes; i++) {
-            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
+            const HFMMesh& mesh = hfmModel.meshes.at(i);
             totalNumVertices += mesh.vertices.size();
         }
         const int32_t MAX_VERTICES_PER_STATIC_MESH = 1e6;
@@ -230,7 +230,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
             return;
         }
 
-        auto& meshes = resource->getHFMGeometry().meshes;
+        auto& meshes = resource->getHFMModel().meshes;
         int32_t numMeshes = (int32_t)(meshes.size());
 
         const int MAX_ALLOWED_MESH_COUNT = 1000;
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index 1b66ff08ad..190d9c3895 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -446,7 +446,7 @@ QVariant ModelOverlay::getProperty(const QString& property) {
 
     if (property == "jointNames") {
         if (_model && _model->isActive()) {
-            // note: going through Rig because Model::getJointNames() (which proxies to HFMGeometry) was always empty
+            // note: going through Rig because Model::getJointNames() (which proxies to HFMModel) was always empty
             const Rig* rig = &(_model->getRig());
             return mapJoints<QStringList, QString>([rig](int jointIndex) -> QString {
                 return rig->nameOfJoint(jointIndex);
@@ -605,11 +605,11 @@ void ModelOverlay::animate() {
         return;
     }
 
-    QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& hfmJoints = _animation->getGeometry().joints;
+    QStringList animationJointNames = _animation->getHFMModel().getJointNames();
+    auto& hfmJoints = _animation->getHFMModel().joints;
 
-    auto& originalHFMJoints = _model->getHFMGeometry().joints;
-    auto& originalFbxIndices = _model->getHFMGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMModel().joints;
+    auto& originalHFMIndices = _model->getHFMModel().jointIndices;
 
     const QVector<glm::quat>& rotations = frames[_lastKnownCurrentFrame].rotations;
     const QVector<glm::vec3>& translations = frames[_lastKnownCurrentFrame].translations;
@@ -628,9 +628,9 @@ void ModelOverlay::animate() {
             } else if (index < animationJointNames.size()) {
                 QString jointName = hfmJoints[index].name;
 
-                if (originalFbxIndices.contains(jointName)) {
+                if (originalHFMIndices.contains(jointName)) {
                     // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get its translation.
-                    int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
+                    int remappedIndex = originalHFMIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
                     translationMat = glm::translate(originalHFMJoints[remappedIndex].translation);
                 }
             }
diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index d630218165..7380ca8a13 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -101,8 +101,8 @@ void AnimClip::copyFromNetworkAnim() {
 
     // build a mapping from animation joint indices to skeleton joint indices.
     // by matching joints with the same name.
-    const HFMGeometry& geom = _networkAnim->getGeometry();
-    AnimSkeleton animSkeleton(geom);
+    const HFMModel& model = _networkAnim->getHFMModel();
+    AnimSkeleton animSkeleton(model);
     const auto animJointCount = animSkeleton.getNumJoints();
     const auto skeletonJointCount = _skeleton->getNumJoints();
     std::vector<int> jointMap;
@@ -115,12 +115,12 @@ void AnimClip::copyFromNetworkAnim() {
         jointMap.push_back(skeletonJoint);
     }
 
-    const int frameCount = geom.animationFrames.size();
+    const int frameCount = model.animationFrames.size();
     _anim.resize(frameCount);
 
     for (int frame = 0; frame < frameCount; frame++) {
 
-        const HFMAnimationFrame& hfmAnimFrame = geom.animationFrames[frame];
+        const HFMAnimationFrame& hfmAnimFrame = model.animationFrames[frame];
 
         // init all joints in animation to default pose
         // this will give us a resonable result for bones in the model skeleton but not in the animation.
@@ -150,7 +150,7 @@ void AnimClip::copyFromNetworkAnim() {
 
                 // adjust translation offsets, so large translation animatons on the reference skeleton
                 // will be adjusted when played on a skeleton with short limbs.
-                const glm::vec3& hfmZeroTrans = geom.animationFrames[0].translations[animJoint];
+                const glm::vec3& hfmZeroTrans = model.animationFrames[0].translations[animJoint];
                 const AnimPose& relDefaultPose = _skeleton->getRelativeDefaultPose(skeletonJoint);
                 float boneLengthScale = 1.0f;
                 const float EPSILON = 0.0001f;
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index fc4114ac7b..bc179739a0 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -16,11 +16,11 @@
 
 #include "AnimationLogging.h"
 
-AnimSkeleton::AnimSkeleton(const HFMGeometry& geometry) {
+AnimSkeleton::AnimSkeleton(const HFMModel& model) {
     // convert to std::vector of joints
     std::vector<HFMJoint> joints;
-    joints.reserve(geometry.joints.size());
-    for (auto& joint : geometry.joints) {
+    joints.reserve(model.joints.size());
+    for (auto& joint : model.joints) {
         joints.push_back(joint);
     }
     buildSkeletonFromJoints(joints);
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 1717d75985..80353523d1 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -23,7 +23,7 @@ public:
     using Pointer = std::shared_ptr<AnimSkeleton>;
     using ConstPointer = std::shared_ptr<const AnimSkeleton>;
 
-    explicit AnimSkeleton(const HFMGeometry& geometry);
+    explicit AnimSkeleton(const HFMModel& model);
     explicit AnimSkeleton(const std::vector<HFMJoint>& joints);
     int nameToJointIndex(const QString& jointName) const;
     const QString& getJointName(int jointIndex) const;
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index b5b27c3a24..06dfc0262a 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -69,14 +69,14 @@ void AnimationReader::run() {
 
         if (urlValid) {
             // Parse the FBX directly from the QNetworkReply
-            HFMGeometry::Pointer fbxgeo;
+            HFMModel::Pointer hfmModel;
             if (_url.path().toLower().endsWith(".fbx")) {
-                fbxgeo.reset(readFBX(_data, QVariantHash(), _url.path()));
+                hfmModel.reset(readFBX(_data, QVariantHash(), _url.path()));
             } else {
                 QString errorStr("usupported format");
                 emit onError(299, errorStr);
             }
-            emit onSuccess(fbxgeo);
+            emit onSuccess(hfmModel);
         } else {
             throw QString("url is invalid");
         }
@@ -88,7 +88,7 @@ void AnimationReader::run() {
 }
 
 bool Animation::isLoaded() const {
-    return _loaded && _geometry;
+    return _loaded && _hfmModel;
 }
 
 QStringList Animation::getJointNames() const {
@@ -99,8 +99,8 @@ QStringList Animation::getJointNames() const {
         return result;
     }
     QStringList names;
-    if (_geometry) {
-        foreach (const HFMJoint& joint, _geometry->joints) {
+    if (_hfmModel) {
+        foreach (const HFMJoint& joint, _hfmModel->joints) {
             names.append(joint.name);
         }
     }
@@ -114,30 +114,30 @@ QVector<HFMAnimationFrame> Animation::getFrames() const {
             Q_RETURN_ARG(QVector<HFMAnimationFrame>, result));
         return result;
     }
-    if (_geometry) {
-        return _geometry->animationFrames;
+    if (_hfmModel) {
+        return _hfmModel->animationFrames;
     } else {
         return QVector<HFMAnimationFrame>();
     }
 }
 
 const QVector<HFMAnimationFrame>& Animation::getFramesReference() const {
-    return _geometry->animationFrames;
+    return _hfmModel->animationFrames;
 }
 
 void Animation::downloadFinished(const QByteArray& data) {
     // parse the animation/fbx file on a background thread.
     AnimationReader* animationReader = new AnimationReader(_url, data);
-    connect(animationReader, SIGNAL(onSuccess(HFMGeometry::Pointer)), SLOT(animationParseSuccess(HFMGeometry::Pointer)));
+    connect(animationReader, SIGNAL(onSuccess(HFMModel::Pointer)), SLOT(animationParseSuccess(HFMModel::Pointer)));
     connect(animationReader, SIGNAL(onError(int, QString)), SLOT(animationParseError(int, QString)));
     QThreadPool::globalInstance()->start(animationReader);
 }
 
-void Animation::animationParseSuccess(HFMGeometry::Pointer geometry) {
+void Animation::animationParseSuccess(HFMModel::Pointer hfmModel) {
 
     qCDebug(animation) << "Animation parse success" << _url.toDisplayString();
 
-    _geometry = geometry;
+    _hfmModel = hfmModel;
     finishedLoading(true);
 }
 
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index 302f23a4e7..4423e8f18d 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -66,7 +66,7 @@ public:
 
     QString getType() const override { return "Animation"; }
 
-    const HFMGeometry& getGeometry() const { return *_geometry; }
+    const HFMModel& getHFMModel() const { return *_hfmModel; }
 
     virtual bool isLoaded() const override;
 
@@ -88,12 +88,12 @@ protected:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected slots:
-    void animationParseSuccess(HFMGeometry::Pointer geometry);
+    void animationParseSuccess(HFMModel::Pointer hfmModel);
     void animationParseError(int error, QString str);
 
 private:
     
-    HFMGeometry::Pointer _geometry;
+    HFMModel::Pointer _hfmModel;
 };
 
 /// Reads geometry in a worker thread.
@@ -105,7 +105,7 @@ public:
     virtual void run() override;
 
 signals:
-    void onSuccess(HFMGeometry::Pointer geometry);
+    void onSuccess(HFMModel::Pointer hfmModel);
     void onError(int error, QString str);
 
 private:
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 2641be92da..c2f909dd24 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -260,14 +260,14 @@ void Rig::destroyAnimGraph() {
     _rightEyeJointChildren.clear();
 }
 
-void Rig::initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset) {
-    _geometryOffset = AnimPose(geometry.offset);
+void Rig::initJointStates(const HFMModel& hfmModel, const glm::mat4& modelOffset) {
+    _geometryOffset = AnimPose(hfmModel.offset);
     _invGeometryOffset = _geometryOffset.inverse();
-    _geometryToRigTransform = modelOffset * geometry.offset;
+    _geometryToRigTransform = modelOffset * hfmModel.offset;
     _rigToGeometryTransform = glm::inverse(_geometryToRigTransform);
     setModelOffset(modelOffset);
 
-    _animSkeleton = std::make_shared<AnimSkeleton>(geometry);
+    _animSkeleton = std::make_shared<AnimSkeleton>(hfmModel);
 
     _internalPoseSet._relativePoses.clear();
     _internalPoseSet._relativePoses = _animSkeleton->getRelativeDefaultPoses();
@@ -293,24 +293,24 @@ void Rig::initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOff
 
     buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses);
 
-    _rootJointIndex = geometry.rootJointIndex;
-    _leftEyeJointIndex = geometry.leftEyeJointIndex;
-    _rightEyeJointIndex = geometry.rightEyeJointIndex;
-    _leftHandJointIndex = geometry.leftHandJointIndex;
-    _leftElbowJointIndex = _leftHandJointIndex >= 0 ? geometry.joints.at(_leftHandJointIndex).parentIndex : -1;
-    _leftShoulderJointIndex = _leftElbowJointIndex >= 0 ? geometry.joints.at(_leftElbowJointIndex).parentIndex : -1;
-    _rightHandJointIndex = geometry.rightHandJointIndex;
-    _rightElbowJointIndex = _rightHandJointIndex >= 0 ? geometry.joints.at(_rightHandJointIndex).parentIndex : -1;
-    _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? geometry.joints.at(_rightElbowJointIndex).parentIndex : -1;
+    _rootJointIndex = hfmModel.rootJointIndex;
+    _leftEyeJointIndex = hfmModel.leftEyeJointIndex;
+    _rightEyeJointIndex = hfmModel.rightEyeJointIndex;
+    _leftHandJointIndex = hfmModel.leftHandJointIndex;
+    _leftElbowJointIndex = _leftHandJointIndex >= 0 ? hfmModel.joints.at(_leftHandJointIndex).parentIndex : -1;
+    _leftShoulderJointIndex = _leftElbowJointIndex >= 0 ? hfmModel.joints.at(_leftElbowJointIndex).parentIndex : -1;
+    _rightHandJointIndex = hfmModel.rightHandJointIndex;
+    _rightElbowJointIndex = _rightHandJointIndex >= 0 ? hfmModel.joints.at(_rightHandJointIndex).parentIndex : -1;
+    _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? hfmModel.joints.at(_rightElbowJointIndex).parentIndex : -1;
 
-    _leftEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.leftEyeJointIndex);
-    _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.rightEyeJointIndex);
+    _leftEyeJointChildren = _animSkeleton->getChildrenOfJoint(hfmModel.leftEyeJointIndex);
+    _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(hfmModel.rightEyeJointIndex);
 }
 
-void Rig::reset(const HFMGeometry& geometry) {
-    _geometryOffset = AnimPose(geometry.offset);
+void Rig::reset(const HFMModel& hfmModel) {
+    _geometryOffset = AnimPose(hfmModel.offset);
     _invGeometryOffset = _geometryOffset.inverse();
-    _animSkeleton = std::make_shared<AnimSkeleton>(geometry);
+    _animSkeleton = std::make_shared<AnimSkeleton>(hfmModel);
 
     _internalPoseSet._relativePoses.clear();
     _internalPoseSet._relativePoses = _animSkeleton->getRelativeDefaultPoses();
@@ -338,18 +338,18 @@ void Rig::reset(const HFMGeometry& geometry) {
 
     buildAbsoluteRigPoses(_animSkeleton->getRelativeDefaultPoses(), _absoluteDefaultPoses);
 
-    _rootJointIndex = geometry.rootJointIndex;
-    _leftEyeJointIndex = geometry.leftEyeJointIndex;
-    _rightEyeJointIndex = geometry.rightEyeJointIndex;
-    _leftHandJointIndex = geometry.leftHandJointIndex;
-    _leftElbowJointIndex = _leftHandJointIndex >= 0 ? geometry.joints.at(_leftHandJointIndex).parentIndex : -1;
-    _leftShoulderJointIndex = _leftElbowJointIndex >= 0 ? geometry.joints.at(_leftElbowJointIndex).parentIndex : -1;
-    _rightHandJointIndex = geometry.rightHandJointIndex;
-    _rightElbowJointIndex = _rightHandJointIndex >= 0 ? geometry.joints.at(_rightHandJointIndex).parentIndex : -1;
-    _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? geometry.joints.at(_rightElbowJointIndex).parentIndex : -1;
+    _rootJointIndex = hfmModel.rootJointIndex;
+    _leftEyeJointIndex = hfmModel.leftEyeJointIndex;
+    _rightEyeJointIndex = hfmModel.rightEyeJointIndex;
+    _leftHandJointIndex = hfmModel.leftHandJointIndex;
+    _leftElbowJointIndex = _leftHandJointIndex >= 0 ? hfmModel.joints.at(_leftHandJointIndex).parentIndex : -1;
+    _leftShoulderJointIndex = _leftElbowJointIndex >= 0 ? hfmModel.joints.at(_leftElbowJointIndex).parentIndex : -1;
+    _rightHandJointIndex = hfmModel.rightHandJointIndex;
+    _rightElbowJointIndex = _rightHandJointIndex >= 0 ? hfmModel.joints.at(_rightHandJointIndex).parentIndex : -1;
+    _rightShoulderJointIndex = _rightElbowJointIndex >= 0 ? hfmModel.joints.at(_rightElbowJointIndex).parentIndex : -1;
 
-    _leftEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.leftEyeJointIndex);
-    _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.rightEyeJointIndex);
+    _leftEyeJointChildren = _animSkeleton->getChildrenOfJoint(hfmModel.leftEyeJointIndex);
+    _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(hfmModel.rightEyeJointIndex);
 
     if (!_animGraphURL.isEmpty()) {
         _animNode.reset();
@@ -1938,7 +1938,7 @@ void Rig::copyJointsIntoJointData(QVector<JointData>& jointDataVec) const {
             data.rotationIsDefaultPose = isEqual(data.rotation, defaultAbsRot);
 
             // translations are in relative frame but scaled so that they are in meters,
-            // instead of geometry units.
+            // instead of model units.
             glm::vec3 defaultRelTrans = _geometryOffset.scale() * _animSkeleton->getRelativeDefaultPose(i).trans();
             data.translation = _geometryOffset.scale() * (!_sendNetworkNode ? _internalPoseSet._relativePoses[i].trans() : _networkPoseSet._relativePoses[i].trans());
             data.translationIsDefaultPose = isEqual(data.translation, defaultRelTrans);
@@ -1963,7 +1963,7 @@ void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
         return;
     }
 
-    // make a vector of rotations in absolute-geometry-frame
+    // make a vector of rotations in absolute-model-frame
     std::vector<glm::quat> rotations;
     rotations.reserve(numJoints);
     const glm::quat rigToGeometryRot(glmExtractRotation(_rigToGeometryTransform));
@@ -1972,7 +1972,7 @@ void Rig::copyJointsFromJointData(const QVector<JointData>& jointDataVec) {
         if (data.rotationIsDefaultPose) {
             rotations.push_back(absoluteDefaultPoses[i].rot());
         } else {
-            // JointData rotations are in absolute rig-frame so we rotate them to absolute geometry-frame
+            // JointData rotations are in absolute rig-frame so we rotate them to absolute model-frame
             rotations.push_back(rigToGeometryRot * data.rotation);
         }
     }
@@ -2008,7 +2008,7 @@ void Rig::computeExternalPoses(const glm::mat4& modelOffsetMat) {
 }
 
 void Rig::computeAvatarBoundingCapsule(
-        const HFMGeometry& geometry,
+        const HFMModel& hfmModel,
         float& radiusOut,
         float& heightOut,
         glm::vec3& localOffsetOut) const {
@@ -2041,7 +2041,7 @@ void Rig::computeAvatarBoundingCapsule(
     // from the head to the hips when computing the rest of the bounding capsule.
     int index = indexOfJoint("Head");
     while (index != -1) {
-        const HFMJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
+        const HFMJointShapeInfo& shapeInfo = hfmModel.joints.at(index).shapeInfo;
         AnimPose pose = _animSkeleton->getAbsoluteDefaultPose(index);
         if (shapeInfo.points.size() > 0) {
             for (auto& point : shapeInfo.points) {
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 61e8672972..345f335f88 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -122,8 +122,8 @@ public:
     void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
     void restoreRoleAnimation(const QString& role);
 
-    void initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset);
-    void reset(const HFMGeometry& geometry);
+    void initJointStates(const HFMModel& hfmModel, const glm::mat4& modelOffset);
+    void reset(const HFMModel& hfmModel);
     bool jointStatesEmpty();
     int getJointStateCount() const;
     int indexOfJoint(const QString& jointName) const;
@@ -210,7 +210,7 @@ public:
     void copyJointsFromJointData(const QVector<JointData>& jointDataVec);
     void computeExternalPoses(const glm::mat4& modelOffsetMat);
 
-    void computeAvatarBoundingCapsule(const HFMGeometry& geometry, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
+    void computeAvatarBoundingCapsule(const HFMModel& hfmModel, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
 
     void setEnableInverseKinematics(bool enable);
     void setEnableAnimations(bool enable);
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index b8448e389d..78f994f462 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1311,7 +1311,7 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::quat rotation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMModel().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
                 }
@@ -1360,7 +1360,7 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::vec3 translation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMModel().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
                 }
@@ -1416,7 +1416,7 @@ void Avatar::withValidJointIndicesCache(std::function<void()> const& worker) con
             if (!_modelJointsCached) {
                 _modelJointIndicesCache.clear();
                 if (_skeletonModel && _skeletonModel->isActive()) {
-                    _modelJointIndicesCache = _skeletonModel->getHFMGeometry().jointIndices;
+                    _modelJointIndicesCache = _skeletonModel->getHFMModel().jointIndices;
                     _modelJointsCached = true;
                 }
             }
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index a41cff528b..13ee5854bf 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -54,9 +54,9 @@ void SkeletonModel::setTextures(const QVariantMap& textures) {
 }
 
 void SkeletonModel::initJointStates() {
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
-    _rig.initJointStates(geometry, modelOffset);
+    _rig.initJointStates(hfmModel, modelOffset);
 
     {
         // initialize _jointData with proper values for default joints
@@ -66,7 +66,7 @@ void SkeletonModel::initJointStates() {
     }
 
     // Determine the default eye position for avatar scale = 1.0
-    int headJointIndex = geometry.headJointIndex;
+    int headJointIndex = hfmModel.headJointIndex;
     if (0 > headJointIndex || headJointIndex >= _rig.getJointStateCount()) {
         qCWarning(avatars_renderer) << "Bad head joint! Got:" << headJointIndex << "jointCount:" << _rig.getJointStateCount();
     }
@@ -74,7 +74,7 @@ void SkeletonModel::initJointStates() {
     getEyeModelPositions(leftEyePosition, rightEyePosition);
     glm::vec3 midEyePosition = (leftEyePosition + rightEyePosition) / 2.0f;
 
-    int rootJointIndex = geometry.rootJointIndex;
+    int rootJointIndex = hfmModel.rootJointIndex;
     glm::vec3 rootModelPosition;
     getJointPosition(rootJointIndex, rootModelPosition);
 
@@ -96,7 +96,7 @@ void SkeletonModel::initJointStates() {
 // Called within Model::simulate call, below.
 void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     assert(!_owningAvatar->isMyAvatar());
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
 
     Head* head = _owningAvatar->getHead();
 
@@ -124,7 +124,7 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
 
     // If the head is not positioned, updateEyeJoints won't get the math right
     glm::quat headOrientation;
-    _rig.getJointRotation(geometry.headJointIndex, headOrientation);
+    _rig.getJointRotation(hfmModel.headJointIndex, headOrientation);
     glm::vec3 eulers = safeEulerAngles(headOrientation);
     head->setBasePitch(glm::degrees(-eulers.x));
     head->setBaseYaw(glm::degrees(eulers.y));
@@ -135,8 +135,8 @@ void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     eyeParams.eyeSaccade = glm::vec3(0.0f);
     eyeParams.modelRotation = getRotation();
     eyeParams.modelTranslation = getTranslation();
-    eyeParams.leftEyeJointIndex = geometry.leftEyeJointIndex;
-    eyeParams.rightEyeJointIndex = geometry.rightEyeJointIndex;
+    eyeParams.leftEyeJointIndex = hfmModel.leftEyeJointIndex;
+    eyeParams.rightEyeJointIndex = hfmModel.rightEyeJointIndex;
 
     _rig.updateFromEyeParameters(eyeParams);
 }
@@ -259,45 +259,45 @@ bool SkeletonModel::getRightShoulderPosition(glm::vec3& position) const {
 }
 
 bool SkeletonModel::getHeadPosition(glm::vec3& headPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().headJointIndex, headPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMModel().headJointIndex, headPosition);
 }
 
 bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMModel().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getLocalNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPosition(getHFMGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPosition(getHFMModel().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getEyeModelPositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
     if (!isActive()) {
         return false;
     }
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
 
-    if (getJointPosition(geometry.leftEyeJointIndex, firstEyePosition) &&
-        getJointPosition(geometry.rightEyeJointIndex, secondEyePosition)) {
+    if (getJointPosition(hfmModel.leftEyeJointIndex, firstEyePosition) &&
+        getJointPosition(hfmModel.rightEyeJointIndex, secondEyePosition)) {
         return true;
     }
     // no eye joints; try to estimate based on head/neck joints
     glm::vec3 neckPosition, headPosition;
-    if (getJointPosition(geometry.neckJointIndex, neckPosition) &&
-        getJointPosition(geometry.headJointIndex, headPosition)) {
+    if (getJointPosition(hfmModel.neckJointIndex, neckPosition) &&
+        getJointPosition(hfmModel.headJointIndex, headPosition)) {
         const float EYE_PROPORTION = 0.6f;
         glm::vec3 baseEyePosition = glm::mix(neckPosition, headPosition, EYE_PROPORTION);
         glm::quat headRotation;
-        getJointRotation(geometry.headJointIndex, headRotation);
+        getJointRotation(hfmModel.headJointIndex, headRotation);
         const float EYES_FORWARD = 0.25f;
         const float EYE_SEPARATION = 0.1f;
         float headHeight = glm::distance(neckPosition, headPosition);
         firstEyePosition = baseEyePosition + headRotation * glm::vec3(EYE_SEPARATION, 0.0f, EYES_FORWARD) * headHeight;
         secondEyePosition = baseEyePosition + headRotation * glm::vec3(-EYE_SEPARATION, 0.0f, EYES_FORWARD) * headHeight;
         return true;
-    } else if (getJointPosition(geometry.headJointIndex, headPosition)) {
+    } else if (getJointPosition(hfmModel.headJointIndex, headPosition)) {
         glm::vec3 baseEyePosition = headPosition;
         glm::quat headRotation;
-        getJointRotation(geometry.headJointIndex, headRotation);
+        getJointRotation(hfmModel.headJointIndex, headRotation);
         const float EYES_FORWARD_HEAD_ONLY = 0.30f;
         const float EYE_SEPARATION = 0.1f;
         firstEyePosition = baseEyePosition + headRotation * glm::vec3(EYE_SEPARATION, 0.0f, EYES_FORWARD_HEAD_ONLY);
@@ -330,15 +330,15 @@ void SkeletonModel::computeBoundingShape() {
         return;
     }
 
-    const HFMGeometry& geometry = getHFMGeometry();
-    if (geometry.joints.isEmpty() || geometry.rootJointIndex == -1) {
+    const HFMModel& model = getHFMModel();
+    if (model.joints.isEmpty() || model.rootJointIndex == -1) {
         // rootJointIndex == -1 if the avatar model has no skeleton
         return;
     }
 
     float radius, height;
     glm::vec3 offset;
-    _rig.computeAvatarBoundingCapsule(geometry, radius, height, offset);
+    _rig.computeAvatarBoundingCapsule(model, radius, height, offset);
     float invScale = 1.0f / _owningAvatar->getModelScale();
     _boundingCapsuleRadius = invScale * radius;
     _boundingCapsuleHeight = invScale * height;
@@ -369,7 +369,7 @@ void SkeletonModel::renderBoundingCollisionShapes(RenderArgs* args, gpu::Batch&
 }
 
 bool SkeletonModel::hasSkeleton() {
-    return isActive() ? getHFMGeometry().rootJointIndex != -1 : false;
+    return isActive() ? getHFMModel().rootJointIndex != -1 : false;
 }
 
 void SkeletonModel::onInvalidate() {
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
index 6c533a5941..c53cf8d333 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
@@ -41,10 +41,10 @@ public:
     void updateAttitude(const glm::quat& orientation);
 
     /// Returns the index of the left hand joint, or -1 if not found.
-    int getLeftHandJointIndex() const { return isActive() ? getHFMGeometry().leftHandJointIndex : -1; }
+    int getLeftHandJointIndex() const { return isActive() ? getHFMModel().leftHandJointIndex : -1; }
 
     /// Returns the index of the right hand joint, or -1 if not found.
-    int getRightHandJointIndex() const { return isActive() ? getHFMGeometry().rightHandJointIndex : -1; }
+    int getRightHandJointIndex() const { return isActive() ? getHFMModel().rightHandJointIndex : -1; }
 
     bool getLeftGrabPosition(glm::vec3& position) const;
     bool getRightGrabPosition(glm::vec3& position) const;
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index 0b76c275d4..9898651268 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -206,7 +206,7 @@ void FBXBaker::importScene() {
     }
 #endif
 
-    _geometry = reader.extractHFMGeometry({}, _modelURL.toString());
+    _model = reader.extractHFMModel({}, _modelURL.toString());
     _textureContentMap = reader._textureContent;
 }
 
@@ -231,7 +231,7 @@ void FBXBaker::rewriteAndBakeSceneModels() {
             for (FBXNode& objectChild : rootChild.children) {
                 if (objectChild.name == "Geometry") {
 
-                    // TODO Pull this out of _geometry instead so we don't have to reprocess it
+                    // TODO Pull this out of _model instead so we don't have to reprocess it
                     auto extractedMesh = FBXReader::extractMesh(objectChild, meshIndex, false);
                     
                     // Callback to get MaterialID
@@ -293,7 +293,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
     QHash<QString, image::TextureUsage::Type> textureTypes;
 
     // enumerate the materials in the extracted geometry so we can determine the texture type for each texture ID
-    for (const auto& material : _geometry->materials) {
+    for (const auto& material : _model->materials) {
         if (material.normalTexture.isBumpmap) {
             textureTypes[material.normalTexture.id] = BUMP_TEXTURE;
         } else {
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 8edaf91c79..8dfde12b31 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -53,7 +53,7 @@ private:
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
 
-    HFMGeometry* _geometry;
+    HFMModel* _model;
     QHash<QString, int> _textureNameMatchCount;
     QHash<QUrl, QString> _remappedTexturePaths;
 
diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index e9130e3fbd..67bd2d5d62 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -153,7 +153,7 @@ void OBJBaker::bakeOBJ() {
     checkIfTexturesFinished();
 }
 
-void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
+void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
     // Generating FBX Header Node
     FBXNode headerNode;
     headerNode.name = FBX_HEADER_EXTENSION;
@@ -199,7 +199,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
     // Compress the mesh information and store in dracoNode
     bool hasDeformers = false; // No concept of deformers for an OBJ
     FBXNode dracoNode;
-    compressMesh(geometry.meshes[0], hasDeformers, dracoNode);
+    compressMesh(model.meshes[0], hasDeformers, dracoNode);
     geometryNode.children.append(dracoNode);
 
     // Generating Object node's child - Model node
@@ -214,17 +214,17 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
     objectNode.children = { geometryNode, modelNode };
 
     // Generating Objects node's child - Material node
-    auto& meshParts = geometry.meshes[0].parts;
+    auto& meshParts = model.meshes[0].parts;
     for (auto& meshPart : meshParts) {
         FBXNode materialNode;
         materialNode.name = MATERIAL_NODE_NAME;
-        if (geometry.materials.size() == 1) {
+        if (model.materials.size() == 1) {
             // case when no material information is provided, OBJReader considers it as a single default material
-            for (auto& materialID : geometry.materials.keys()) {
-                setMaterialNodeProperties(materialNode, materialID, geometry);
+            for (auto& materialID : model.materials.keys()) {
+                setMaterialNodeProperties(materialNode, materialID, model);
             }
         } else {
-            setMaterialNodeProperties(materialNode, meshPart.materialID, geometry);
+            setMaterialNodeProperties(materialNode, meshPart.materialID, model);
         }
 
         objectNode.children.append(materialNode);
@@ -235,7 +235,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
     auto size = meshParts.size();
     for (int i = 0; i < size; i++) {
         QString material = meshParts[i].materialID;
-        HFMMaterial currentMaterial = geometry.materials[material];
+        HFMMaterial currentMaterial = model.materials[material];
         if (!currentMaterial.albedoTexture.filename.isEmpty() || !currentMaterial.specularTexture.filename.isEmpty()) {
             auto textureID = nextNodeID();
             _mapTextureMaterial.emplace_back(textureID, i);
@@ -325,12 +325,12 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
 }
 
 // Set properties for material nodes
-void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry) {
+void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& model) {
     auto materialID = nextNodeID();
     _materialIDs.push_back(materialID);
     materialNode.properties = { materialID, material, MESH };
 
-    HFMMaterial currentMaterial = geometry.materials[material];
+    HFMMaterial currentMaterial = model.materials[material];
 
     // Setting the hierarchy: Material -> Properties70 -> P -> Properties
     FBXNode properties70Node;
diff --git a/libraries/baking/src/OBJBaker.h b/libraries/baking/src/OBJBaker.h
index 875a500129..f889730ffa 100644
--- a/libraries/baking/src/OBJBaker.h
+++ b/libraries/baking/src/OBJBaker.h
@@ -39,8 +39,8 @@ private slots:
 
 private:
     void loadOBJ();
-    void createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry);
-    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry);
+    void createFBXNodeTree(FBXNode& rootNode, HFMModel& model);
+    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& model);
     NodeID nextNodeID() { return _nodeID++; }
 
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c36f60600f..f60bf20e3d 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -268,7 +268,7 @@ EntityItemProperties RenderableModelEntityItem::getProperties(const EntityProper
         if (model->isLoaded()) {
             // TODO: improve naturalDimensions in the future,
             //       for now we've added this hack for setting natural dimensions of models
-            Extents meshExtents = model->getHFMGeometry().getUnscaledMeshExtents();
+            Extents meshExtents = model->getHFMModel().getUnscaledMeshExtents();
             properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
             properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
         }
@@ -403,7 +403,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const HFMGeometry& collisionGeometry = _compoundShapeResource->getHFMGeometry();
+        const HFMModel& collisionGeometry = _compoundShapeResource->getHFMModel();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -478,7 +478,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / model->getHFMGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / model->getHFMModel().getUnscaledMeshExtents().size();
         // multiply each point by scale before handing the point-set off to the physics engine.
         // also determine the extents of the collision model.
         glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint());
@@ -498,12 +498,12 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         // compute meshPart local transforms
         QVector<glm::mat4> localTransforms;
-        const HFMGeometry& hfmGeometry = model->getHFMGeometry();
-        int numHFMMeshes = hfmGeometry.meshes.size();
+        const HFMModel& hfmModel = model->getHFMModel();
+        int numHFMMeshes = hfmModel.meshes.size();
         int totalNumVertices = 0;
         glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
         for (int i = 0; i < numHFMMeshes; i++) {
-            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
+            const HFMMesh& mesh = hfmModel.meshes.at(i);
             if (mesh.clusters.size() > 0) {
                 const HFMCluster& cluster = mesh.clusters.at(0);
                 auto jointMatrix = model->getRig().getJointTransform(cluster.jointIndex);
@@ -524,7 +524,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         std::vector<std::shared_ptr<const graphics::Mesh>> meshes;
         if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
-            auto& hfmMeshes = _compoundShapeResource->getHFMGeometry().meshes;
+            auto& hfmMeshes = _compoundShapeResource->getHFMModel().meshes;
             meshes.reserve(hfmMeshes.size());
             for (auto& hfmMesh : hfmMeshes) {
                 meshes.push_back(hfmMesh._mesh);
@@ -755,7 +755,7 @@ int RenderableModelEntityItem::avatarJointIndex(int modelJointIndex) {
 bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
     auto model = getModel();
     if (EntityItem::contains(point) && model && _compoundShapeResource && _compoundShapeResource->isLoaded()) {
-        return _compoundShapeResource->getHFMGeometry().convexHullContains(worldToEntity(point));
+        return _compoundShapeResource->getHFMModel().convexHullContains(worldToEntity(point));
     }
 
     return false;
@@ -1159,11 +1159,11 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
         return;
     }
 
-    QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& hfmJoints = _animation->getGeometry().joints;
+    QStringList animationJointNames = _animation->getHFMModel().getJointNames();
+    auto& hfmJoints = _animation->getHFMModel().joints;
 
-    auto& originalHFMJoints = _model->getHFMGeometry().joints;
-    auto& originalHFMIndices = _model->getHFMGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMModel().joints;
+    auto& originalHFMIndices = _model->getHFMModel().jointIndices;
 
     bool allowTranslation = entity->getAnimationAllowTranslation();
 
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index 8051dbafea..84caa98ace 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -231,7 +231,7 @@ public:
     bool needTangentSpace() const;
 };
 
-/// A single mesh (with optional blendshapes) extracted from an FBX document.
+/// A single mesh (with optional blendshapes).
 class HFMMesh {
 public:
 
@@ -277,7 +277,7 @@ public:
  * @property {Quat[]} rotations
  * @property {Vec3[]} translations
  */
-/// A single animation frame extracted from an FBX document.
+/// A single animation frame.
 class HFMAnimationFrame {
 public:
     QVector<glm::quat> rotations;
@@ -305,10 +305,10 @@ public:
 Q_DECLARE_METATYPE(HFMAnimationFrame)
 Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
 
-/// A set of meshes extracted from an FBX document.
-class HFMGeometry {
+/// The runtime model format.
+class HFMModel {
 public:
-    using Pointer = std::shared_ptr<HFMGeometry>;
+    using Pointer = std::shared_ptr<HFMModel>;
 
     QString originalURL;
     QString author;
@@ -368,7 +368,7 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(HFMGeometry)
-Q_DECLARE_METATYPE(HFMGeometry::Pointer)
+Q_DECLARE_METATYPE(HFMModel)
+Q_DECLARE_METATYPE(HFMModel::Pointer)
 
 #endif // hifi_FBX_h_
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index df6abbfdf2..15ba5f0101 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -40,9 +40,9 @@
 
 using namespace std;
 
-int HFMGeometryPointerMetaTypeId = qRegisterMetaType<HFMGeometry::Pointer>();
+int HFMModelPointerMetaTypeId = qRegisterMetaType<HFMModel::Pointer>();
 
-QStringList HFMGeometry::getJointNames() const {
+QStringList HFMModel::getJointNames() const {
     QStringList names;
     foreach (const HFMJoint& joint, joints) {
         names.append(joint.name);
@@ -50,7 +50,7 @@ QStringList HFMGeometry::getJointNames() const {
     return names;
 }
 
-bool HFMGeometry::hasBlendedMeshes() const {
+bool HFMModel::hasBlendedMeshes() const {
     if (!meshes.isEmpty()) {
         foreach (const HFMMesh& mesh, meshes) {
             if (!mesh.blendshapes.isEmpty()) {
@@ -61,7 +61,7 @@ bool HFMGeometry::hasBlendedMeshes() const {
     return false;
 }
 
-Extents HFMGeometry::getUnscaledMeshExtents() const {
+Extents HFMModel::getUnscaledMeshExtents() const {
     const Extents& extents = meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
@@ -74,7 +74,7 @@ Extents HFMGeometry::getUnscaledMeshExtents() const {
 }
 
 // TODO: Move to graphics::Mesh when Sam's ready
-bool HFMGeometry::convexHullContains(const glm::vec3& point) const {
+bool HFMModel::convexHullContains(const glm::vec3& point) const {
     if (!getUnscaledMeshExtents().containsPoint(point)) {
         return false;
     }
@@ -124,16 +124,16 @@ bool HFMGeometry::convexHullContains(const glm::vec3& point) const {
     return false;
 }
 
-QString HFMGeometry::getModelNameOfMesh(int meshIndex) const {
+QString HFMModel::getModelNameOfMesh(int meshIndex) const {
     if (meshIndicesToModelNames.contains(meshIndex)) {
         return meshIndicesToModelNames.value(meshIndex);
     }
     return QString();
 }
 
-int hfmGeometryMetaTypeId = qRegisterMetaType<HFMGeometry>();
+int hfmModelMetaTypeId = qRegisterMetaType<HFMModel>();
 int hfmAnimationFrameMetaTypeId = qRegisterMetaType<HFMAnimationFrame>();
-int hfmAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<HFMAnimationFrame> >();
+int hfmAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<HFMAnimationFrame>>();
 
 
 glm::vec3 parseVec3(const QString& string) {
@@ -403,7 +403,7 @@ static void createTangents(const HFMMesh& mesh, bool generateFromTexCoords,
                 setTangents(mesh, accessor, part.triangleIndices.at(i + 2), part.triangleIndices.at(i), vertices, normals, tangents);
             }
             if ((part.triangleIndices.size() % 3) != 0) {
-                qCDebug(modelformat) << "Error in extractHFMGeometry part.triangleIndices.size() is not divisible by three ";
+                qCDebug(modelformat) << "Error in extractHFMModel part.triangleIndices.size() is not divisible by three ";
             }
         }
     }
@@ -615,7 +615,7 @@ QByteArray fileOnUrl(const QByteArray& filepath, const QString& url) {
     return filepath.mid(filepath.lastIndexOf('/') + 1);
 }
 
-HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QString& url) {
+HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString& url) {
     const FBXNode& node = _rootNode;
     QMap<QString, ExtractedMesh> meshes;
     QHash<QString, QString> modelIDsToNames;
@@ -624,7 +624,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
 
     QVector<ExtractedBlendshape> blendshapes;
 
-    QHash<QString, FBXModel> models;
+    QHash<QString, FBXModel> fbxModels;
     QHash<QString, Cluster> clusters; 
     QHash<QString, AnimationCurve> animationCurves;
 
@@ -689,10 +689,10 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
 #if defined(DEBUG_FBXREADER)
     int unknown = 0;
 #endif
-    HFMGeometry* geometryPtr = new HFMGeometry;
-    HFMGeometry& geometry = *geometryPtr;
+    HFMModel* modelPtr = new HFMModel;
+    HFMModel& model = *modelPtr;
 
-    geometry.originalURL = url;
+    model.originalURL = url;
 
     float unitScaleFactor = 1.0f;
     glm::vec3 ambientColor;
@@ -708,7 +708,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                         if (subobject.name == "MetaData") {
                             foreach (const FBXNode& subsubobject, subobject.children) {
                                 if (subsubobject.name == "Author") {
-                                    geometry.author = subsubobject.properties.at(0).toString();
+                                    model.author = subsubobject.properties.at(0).toString();
                                 }
                             }
                         } else if (subobject.name == "Properties70") {
@@ -716,7 +716,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                                 static const QVariant APPLICATION_NAME = QVariant(QByteArray("Original|ApplicationName"));
                                 if (subsubobject.name == "P" && subsubobject.properties.size() >= 5 &&
                                         subsubobject.properties.at(0) == APPLICATION_NAME) {
-                                    geometry.applicationName = subsubobject.properties.at(4).toString();
+                                    model.applicationName = subsubobject.properties.at(4).toString();
                                 }
                             }
                         }
@@ -814,7 +814,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                     glm::vec3 geometricRotation;
 
                     glm::vec3 rotationMin, rotationMax;
-                    FBXModel model = { name, -1, glm::vec3(), glm::mat4(), glm::quat(), glm::quat(), glm::quat(),
+                    FBXModel fbxModel = { name, -1, glm::vec3(), glm::mat4(), glm::quat(), glm::quat(), glm::quat(),
                                        glm::mat4(), glm::vec3(), glm::vec3(),
                                        false, glm::vec3(), glm::quat(), glm::vec3(1.0f) };
                     ExtractedMesh* mesh = NULL;
@@ -963,27 +963,27 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                     }
 
                     // see FBX documentation, http://download.autodesk.com/us/fbx/20112/FBX_SDK_HELP/index.html
-                    model.translation = translation;
+                    fbxModel.translation = translation;
 
-                    model.preTransform = glm::translate(rotationOffset) * glm::translate(rotationPivot);
-                    model.preRotation = glm::quat(glm::radians(preRotation));
-                    model.rotation = glm::quat(glm::radians(rotation));
-                    model.postRotation = glm::inverse(glm::quat(glm::radians(postRotation)));
-                    model.postTransform = glm::translate(-rotationPivot) * glm::translate(scaleOffset) *
+                    fbxModel.preTransform = glm::translate(rotationOffset) * glm::translate(rotationPivot);
+                    fbxModel.preRotation = glm::quat(glm::radians(preRotation));
+                    fbxModel.rotation = glm::quat(glm::radians(rotation));
+                    fbxModel.postRotation = glm::inverse(glm::quat(glm::radians(postRotation)));
+                    fbxModel.postTransform = glm::translate(-rotationPivot) * glm::translate(scaleOffset) *
                         glm::translate(scalePivot) * glm::scale(scale) * glm::translate(-scalePivot);
                     // NOTE: angles from the FBX file are in degrees
                     // so we convert them to radians for the FBXModel class
-                    model.rotationMin = glm::radians(glm::vec3(rotationMinX ? rotationMin.x : -180.0f,
+                    fbxModel.rotationMin = glm::radians(glm::vec3(rotationMinX ? rotationMin.x : -180.0f,
                         rotationMinY ? rotationMin.y : -180.0f, rotationMinZ ? rotationMin.z : -180.0f));
-                    model.rotationMax = glm::radians(glm::vec3(rotationMaxX ? rotationMax.x : 180.0f,
+                    fbxModel.rotationMax = glm::radians(glm::vec3(rotationMaxX ? rotationMax.x : 180.0f,
                         rotationMaxY ? rotationMax.y : 180.0f, rotationMaxZ ? rotationMax.z : 180.0f));
 
-                    model.hasGeometricOffset = hasGeometricOffset;
-                    model.geometricTranslation = geometricTranslation;
-                    model.geometricRotation = glm::quat(glm::radians(geometricRotation));
-                    model.geometricScaling = geometricScaling;
+                    fbxModel.hasGeometricOffset = hasGeometricOffset;
+                    fbxModel.geometricTranslation = geometricTranslation;
+                    fbxModel.geometricRotation = glm::quat(glm::radians(geometricRotation));
+                    fbxModel.geometricScaling = geometricScaling;
 
-                    models.insert(getID(object.properties), model);
+                    fbxModels.insert(getID(object.properties), fbxModel);
                 } else if (object.name == "Texture") {
                     TextureParam tex;
                     foreach (const FBXNode& subobject, object.children) {
@@ -1307,7 +1307,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                             name = name.mid(name.lastIndexOf('.') + 1);
                         }
                         QString id = getID(object.properties);
-                        geometry.blendshapeChannelNames << name;
+                        model.blendshapeChannelNames << name;
                         foreach (const WeightedIndex& index, blendshapeIndices.values(name)) {
                             blendshapeChannelIndices.insert(id, index);
                         }
@@ -1454,26 +1454,26 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
     float offsetScale = mapping.value("scale", 1.0f).toFloat() * unitScaleFactor * METERS_PER_CENTIMETER;
     glm::quat offsetRotation = glm::quat(glm::radians(glm::vec3(mapping.value("rx").toFloat(),
             mapping.value("ry").toFloat(), mapping.value("rz").toFloat())));
-    geometry.offset = glm::translate(glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(),
+    model.offset = glm::translate(glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(),
         mapping.value("tz").toFloat())) * glm::mat4_cast(offsetRotation) *
             glm::scale(glm::vec3(offsetScale, offsetScale, offsetScale));
 
     // get the list of models in depth-first traversal order
     QVector<QString> modelIDs;
-    QSet<QString> remainingModels;
-    for (QHash<QString, FBXModel>::const_iterator model = models.constBegin(); model != models.constEnd(); model++) {
+    QSet<QString> remainingFBXModels;
+    for (QHash<QString, FBXModel>::const_iterator fbxModel = fbxModels.constBegin(); fbxModel != fbxModels.constEnd(); fbxModel++) {
         // models with clusters must be parented to the cluster top
         // Unless the model is a root node.
-        bool isARootNode = !modelIDs.contains(_connectionParentMap.value(model.key()));
+        bool isARootNode = !modelIDs.contains(_connectionParentMap.value(fbxModel.key()));
         if (!isARootNode) {  
-            foreach(const QString& deformerID, _connectionChildMap.values(model.key())) {
+            foreach(const QString& deformerID, _connectionChildMap.values(fbxModel.key())) {
                 foreach(const QString& clusterID, _connectionChildMap.values(deformerID)) {
                     if (!clusters.contains(clusterID)) {
                         continue;
                     }
-                    QString topID = getTopModelID(_connectionParentMap, models, _connectionChildMap.value(clusterID), url);
-                    _connectionChildMap.remove(_connectionParentMap.take(model.key()), model.key());
-                    _connectionParentMap.insert(model.key(), topID);
+                    QString topID = getTopModelID(_connectionParentMap, fbxModels, _connectionChildMap.value(clusterID), url);
+                    _connectionChildMap.remove(_connectionParentMap.take(fbxModel.key()), fbxModel.key());
+                    _connectionParentMap.insert(fbxModel.key(), topID);
                     goto outerBreak;
                 }
             }
@@ -1481,21 +1481,21 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         }
 
         // make sure the parent is in the child map
-        QString parent = _connectionParentMap.value(model.key());
-        if (!_connectionChildMap.contains(parent, model.key())) {
-            _connectionChildMap.insert(parent, model.key());
+        QString parent = _connectionParentMap.value(fbxModel.key());
+        if (!_connectionChildMap.contains(parent, fbxModel.key())) {
+            _connectionChildMap.insert(parent, fbxModel.key());
         }
-        remainingModels.insert(model.key());
+        remainingFBXModels.insert(fbxModel.key());
     }
-    while (!remainingModels.isEmpty()) {
-        QString first = *remainingModels.constBegin();
-        foreach (const QString& id, remainingModels) {
+    while (!remainingFBXModels.isEmpty()) {
+        QString first = *remainingFBXModels.constBegin();
+        foreach (const QString& id, remainingFBXModels) {
             if (id < first) {
                 first = id;
             }
         }
-        QString topID = getTopModelID(_connectionParentMap, models, first, url);
-        appendModelIDs(_connectionParentMap.value(topID), _connectionChildMap, models, remainingModels, modelIDs, true);
+        QString topID = getTopModelID(_connectionParentMap, fbxModels, first, url);
+        appendModelIDs(_connectionParentMap.value(topID), _connectionChildMap, fbxModels, remainingFBXModels, modelIDs, true);
     }
 
     // figure the number of animation frames from the curves
@@ -1507,53 +1507,53 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         HFMAnimationFrame frame;
         frame.rotations.resize(modelIDs.size());
         frame.translations.resize(modelIDs.size());
-        geometry.animationFrames.append(frame);
+        model.animationFrames.append(frame);
     }
 
     // convert the models to joints
     QVariantList freeJoints = mapping.values("freeJoint");
-    geometry.hasSkeletonJoints = false;
+    model.hasSkeletonJoints = false;
     foreach (const QString& modelID, modelIDs) {
-        const FBXModel& model = models[modelID];
+        const FBXModel& fbxModel = fbxModels[modelID];
         HFMJoint joint;
-        joint.isFree = freeJoints.contains(model.name);
-        joint.parentIndex = model.parentIndex;
+        joint.isFree = freeJoints.contains(fbxModel.name);
+        joint.parentIndex = fbxModel.parentIndex;
 
         // get the indices of all ancestors starting with the first free one (if any)
-        int jointIndex = geometry.joints.size();
+        int jointIndex = model.joints.size();
         joint.freeLineage.append(jointIndex);
         int lastFreeIndex = joint.isFree ? 0 : -1;
-        for (int index = joint.parentIndex; index != -1; index = geometry.joints.at(index).parentIndex) {
-            if (geometry.joints.at(index).isFree) {
+        for (int index = joint.parentIndex; index != -1; index = model.joints.at(index).parentIndex) {
+            if (model.joints.at(index).isFree) {
                 lastFreeIndex = joint.freeLineage.size();
             }
             joint.freeLineage.append(index);
         }
         joint.freeLineage.remove(lastFreeIndex + 1, joint.freeLineage.size() - lastFreeIndex - 1);
-        joint.translation = model.translation; // these are usually in centimeters
-        joint.preTransform = model.preTransform;
-        joint.preRotation = model.preRotation;
-        joint.rotation = model.rotation;
-        joint.postRotation = model.postRotation;
-        joint.postTransform = model.postTransform;
-        joint.rotationMin = model.rotationMin;
-        joint.rotationMax = model.rotationMax;
+        joint.translation = fbxModel.translation; // these are usually in centimeters
+        joint.preTransform = fbxModel.preTransform;
+        joint.preRotation = fbxModel.preRotation;
+        joint.rotation = fbxModel.rotation;
+        joint.postRotation = fbxModel.postRotation;
+        joint.postTransform = fbxModel.postTransform;
+        joint.rotationMin = fbxModel.rotationMin;
+        joint.rotationMax = fbxModel.rotationMax;
 
-        joint.hasGeometricOffset = model.hasGeometricOffset;
-        joint.geometricTranslation = model.geometricTranslation;
-        joint.geometricRotation = model.geometricRotation;
-        joint.geometricScaling = model.geometricScaling;
+        joint.hasGeometricOffset = fbxModel.hasGeometricOffset;
+        joint.geometricTranslation = fbxModel.geometricTranslation;
+        joint.geometricRotation = fbxModel.geometricRotation;
+        joint.geometricScaling = fbxModel.geometricScaling;
 
         glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation;
 
         if (joint.parentIndex == -1) {
-            joint.transform = geometry.offset * glm::translate(joint.translation) * joint.preTransform *
+            joint.transform = model.offset * glm::translate(joint.translation) * joint.preTransform *
                 glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation);
             joint.distanceToParent = 0.0f;
 
         } else {
-            const HFMJoint& parentJoint = geometry.joints.at(joint.parentIndex);
+            const HFMJoint& parentJoint = model.joints.at(joint.parentIndex);
             joint.transform = parentJoint.transform * glm::translate(joint.translation) *
                 joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation) * parentJoint.inverseDefaultRotation;
@@ -1561,20 +1561,20 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                 extractTranslation(joint.transform));
         }
         joint.inverseBindRotation = joint.inverseDefaultRotation;
-        joint.name = model.name;
+        joint.name = fbxModel.name;
 
         foreach (const QString& childID, _connectionChildMap.values(modelID)) {
             QString type = typeFlags.value(childID);
             if (!type.isEmpty()) {
-                geometry.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
+                model.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
                 break;
             }
         }
 
         joint.bindTransformFoundInCluster = false;
 
-        geometry.joints.append(joint);
-        geometry.jointIndices.insert(model.name, geometry.joints.size());
+        model.joints.append(joint);
+        model.jointIndices.insert(fbxModel.name, model.joints.size());
 
         QString rotationID = localRotations.value(modelID);
         AnimationCurve xRotCurve = animationCurves.value(xComponents.value(rotationID));
@@ -1590,11 +1590,11 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         glm::vec3 defaultPosValues = joint.translation;
 
         for (int i = 0; i < frameCount; i++) {
-            geometry.animationFrames[i].rotations[jointIndex] = glm::quat(glm::radians(glm::vec3(
+            model.animationFrames[i].rotations[jointIndex] = glm::quat(glm::radians(glm::vec3(
                 xRotCurve.values.isEmpty() ? defaultRotValues.x : xRotCurve.values.at(i % xRotCurve.values.size()),
                 yRotCurve.values.isEmpty() ? defaultRotValues.y : yRotCurve.values.at(i % yRotCurve.values.size()),
                 zRotCurve.values.isEmpty() ? defaultRotValues.z : zRotCurve.values.at(i % zRotCurve.values.size()))));
-            geometry.animationFrames[i].translations[jointIndex] = glm::vec3(
+            model.animationFrames[i].translations[jointIndex] = glm::vec3(
                 xPosCurve.values.isEmpty() ? defaultPosValues.x : xPosCurve.values.at(i % xPosCurve.values.size()),
                 yPosCurve.values.isEmpty() ? defaultPosValues.y : yPosCurve.values.at(i % yPosCurve.values.size()),
                 zPosCurve.values.isEmpty() ? defaultPosValues.z : zPosCurve.values.at(i % zPosCurve.values.size()));
@@ -1603,32 +1603,32 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
 
     // NOTE: shapeVertices are in joint-frame
     std::vector<ShapeVertices> shapeVertices;
-    shapeVertices.resize(std::max(1, geometry.joints.size()) );
+    shapeVertices.resize(std::max(1, model.joints.size()) );
 
     // find our special joints
-    geometry.leftEyeJointIndex = modelIDs.indexOf(jointEyeLeftID);
-    geometry.rightEyeJointIndex = modelIDs.indexOf(jointEyeRightID);
-    geometry.neckJointIndex = modelIDs.indexOf(jointNeckID);
-    geometry.rootJointIndex = modelIDs.indexOf(jointRootID);
-    geometry.leanJointIndex = modelIDs.indexOf(jointLeanID);
-    geometry.headJointIndex = modelIDs.indexOf(jointHeadID);
-    geometry.leftHandJointIndex = modelIDs.indexOf(jointLeftHandID);
-    geometry.rightHandJointIndex = modelIDs.indexOf(jointRightHandID);
-    geometry.leftToeJointIndex = modelIDs.indexOf(jointLeftToeID);
-    geometry.rightToeJointIndex = modelIDs.indexOf(jointRightToeID);
+    model.leftEyeJointIndex = modelIDs.indexOf(jointEyeLeftID);
+    model.rightEyeJointIndex = modelIDs.indexOf(jointEyeRightID);
+    model.neckJointIndex = modelIDs.indexOf(jointNeckID);
+    model.rootJointIndex = modelIDs.indexOf(jointRootID);
+    model.leanJointIndex = modelIDs.indexOf(jointLeanID);
+    model.headJointIndex = modelIDs.indexOf(jointHeadID);
+    model.leftHandJointIndex = modelIDs.indexOf(jointLeftHandID);
+    model.rightHandJointIndex = modelIDs.indexOf(jointRightHandID);
+    model.leftToeJointIndex = modelIDs.indexOf(jointLeftToeID);
+    model.rightToeJointIndex = modelIDs.indexOf(jointRightToeID);
 
     foreach (const QString& id, humanIKJointIDs) {
-        geometry.humanIKJointIndices.append(modelIDs.indexOf(id));
+        model.humanIKJointIndices.append(modelIDs.indexOf(id));
     }
 
     // extract the translation component of the neck transform
-    if (geometry.neckJointIndex != -1) {
-        const glm::mat4& transform = geometry.joints.at(geometry.neckJointIndex).transform;
-        geometry.neckPivot = glm::vec3(transform[3][0], transform[3][1], transform[3][2]);
+    if (model.neckJointIndex != -1) {
+        const glm::mat4& transform = model.joints.at(model.neckJointIndex).transform;
+        model.neckPivot = glm::vec3(transform[3][0], transform[3][1], transform[3][2]);
     }
 
-    geometry.bindExtents.reset();
-    geometry.meshExtents.reset();
+    model.bindExtents.reset();
+    model.meshExtents.reset();
 
     // Create the Material Library
     consolidateHFMMaterials(mapping);
@@ -1664,7 +1664,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         }
     }
 #endif
-    geometry.materials = _hfmMaterials;
+    model.materials = _hfmMaterials;
 
     // see if any materials have texture children
     bool materialsHaveTextures = checkMaterialsHaveTextures(_hfmMaterials, _textureFilenames, _connectionChildMap);
@@ -1675,14 +1675,14 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         extracted.mesh.meshExtents.reset();
 
         // accumulate local transforms
-        QString modelID = models.contains(it.key()) ? it.key() : _connectionParentMap.value(it.key());
-        glm::mat4 modelTransform = getGlobalTransform(_connectionParentMap, models, modelID, geometry.applicationName == "mixamo.com", url);
+        QString modelID = fbxModels.contains(it.key()) ? it.key() : _connectionParentMap.value(it.key());
+        glm::mat4 modelTransform = getGlobalTransform(_connectionParentMap, fbxModels, modelID, model.applicationName == "mixamo.com", url);
 
         // compute the mesh extents from the transformed vertices
         foreach (const glm::vec3& vertex, extracted.mesh.vertices) {
             glm::vec3 transformedVertex = glm::vec3(modelTransform * glm::vec4(vertex, 1.0f));
-            geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
-            geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
+            model.meshExtents.minimum = glm::min(model.meshExtents.minimum, transformedVertex);
+            model.meshExtents.maximum = glm::max(model.meshExtents.maximum, transformedVertex);
 
             extracted.mesh.meshExtents.minimum = glm::min(extracted.mesh.meshExtents.minimum, transformedVertex);
             extracted.mesh.meshExtents.maximum = glm::max(extracted.mesh.meshExtents.maximum, transformedVertex);
@@ -1763,14 +1763,14 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                 extracted.mesh.clusters.append(hfmCluster);
 
                 // override the bind rotation with the transform link
-                HFMJoint& joint = geometry.joints[hfmCluster.jointIndex];
+                HFMJoint& joint = model.joints[hfmCluster.jointIndex];
                 joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
                 joint.bindTransform = cluster.transformLink;
                 joint.bindTransformFoundInCluster = true;
 
                 // update the bind pose extents
-                glm::vec3 bindTranslation = extractTranslation(geometry.offset * joint.bindTransform);
-                geometry.bindExtents.addPoint(bindTranslation);
+                glm::vec3 bindTranslation = extractTranslation(model.offset * joint.bindTransform);
+                model.bindExtents.addPoint(bindTranslation);
             }
         }
 
@@ -1801,14 +1801,14 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
                 const Cluster& cluster = clusters[clusterID];
                 const HFMCluster& hfmCluster = extracted.mesh.clusters.at(i);
                 int jointIndex = hfmCluster.jointIndex;
-                HFMJoint& joint = geometry.joints[jointIndex];
+                HFMJoint& joint = model.joints[jointIndex];
                 glm::mat4 transformJointToMesh = inverseModelTransform * joint.bindTransform;
                 glm::vec3 boneEnd = extractTranslation(transformJointToMesh);
                 glm::vec3 boneBegin = boneEnd;
                 glm::vec3 boneDirection;
                 float boneLength = 0.0f;
                 if (joint.parentIndex != -1) {
-                    boneBegin = extractTranslation(inverseModelTransform * geometry.joints[joint.parentIndex].bindTransform);
+                    boneBegin = extractTranslation(inverseModelTransform * model.joints[joint.parentIndex].bindTransform);
                     boneDirection = boneEnd - boneBegin;
                     boneLength = glm::length(boneDirection);
                     if (boneLength > EPSILON) {
@@ -1882,7 +1882,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         } else {
             // this is a single-mesh joint
             int jointIndex = firstHFMCluster.jointIndex;
-            HFMJoint& joint = geometry.joints[jointIndex];
+            HFMJoint& joint = model.joints[jointIndex];
 
             // transform cluster vertices to joint-frame and save for later
             glm::mat4 meshToJoint = glm::inverse(joint.bindTransform) * modelTransform;
@@ -1902,8 +1902,8 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
         }
         buildModelMesh(extracted.mesh, url);
 
-        geometry.meshes.append(extracted.mesh);
-        int meshIndex = geometry.meshes.size() - 1;
+        model.meshes.append(extracted.mesh);
+        int meshIndex = model.meshes.size() - 1;
         if (extracted.mesh._mesh) {
             extracted.mesh._mesh->displayName = QString("%1#/mesh/%2").arg(url).arg(meshIndex).toStdString();
             extracted.mesh._mesh->modelName = modelIDsToNames.value(modelID).toStdString();
@@ -1923,8 +1923,8 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
     };
 
     // now that all joints have been scanned compute a k-Dop bounding volume of mesh
-    for (int i = 0; i < geometry.joints.size(); ++i) {
-        HFMJoint& joint = geometry.joints[i];
+    for (int i = 0; i < model.joints.size(); ++i) {
+        HFMJoint& joint = model.joints[i];
 
         // NOTE: points are in joint-frame
         ShapeVertices& points = shapeVertices.at(i);
@@ -1958,7 +1958,7 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
             generateBoundryLinesForDop14(joint.shapeInfo.dots, joint.shapeInfo.avgPoint, joint.shapeInfo.debugLines);
         }
     }
-    geometry.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
+    model.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
 
     // attempt to map any meshes to a named model
     for (QHash<QString, int>::const_iterator m = meshIDsToMeshIndices.constBegin();
@@ -1971,14 +1971,14 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
             const QString& modelID = ooChildToParent.value(meshID);
             if (modelIDsToNames.contains(modelID)) {
                 const QString& modelName = modelIDsToNames.value(modelID);
-                geometry.meshIndicesToModelNames.insert(meshIndex, modelName);
+                model.meshIndicesToModelNames.insert(meshIndex, modelName);
             }
         }
     }
     {
         int i = 0;
-        for (const auto& mesh : geometry.meshes) {
-            auto name = geometry.getModelNameOfMesh(i++);
+        for (const auto& mesh : model.meshes) {
+            auto name = model.getModelNameOfMesh(i++);
             if (!name.isEmpty()) {
                 if (mesh._mesh) {
                     mesh._mesh->modelName = name.toStdString();
@@ -1991,16 +1991,16 @@ HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QS
             }
         }
     }
-    return geometryPtr;
+    return modelPtr;
 }
 
-HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
-    QBuffer buffer(const_cast<QByteArray*>(&model));
+HFMModel* readFBX(const QByteArray& data, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+    QBuffer buffer(const_cast<QByteArray*>(&data));
     buffer.open(QIODevice::ReadOnly);
     return readFBX(&buffer, mapping, url, loadLightmaps, lightmapLevel);
 }
 
-HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+HFMModel* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     FBXReader reader;
     reader._rootNode = FBXReader::parseFBX(device);
     reader._loadLightmaps = loadLightmaps;
@@ -2008,5 +2008,5 @@ HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QStri
 
     qCDebug(modelformat) << "Reading FBX: " << url;
 
-    return reader.extractHFMGeometry(mapping, url);
+    return reader.extractHFMModel(mapping, url);
 }
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index f95ba7fe73..d9a216eeb8 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -34,13 +34,13 @@
 class QIODevice;
 class FBXNode;
 
-/// Reads FBX geometry from the supplied model and mapping data.
+/// Reads HFMModel from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMModel* readFBX(const QByteArray& data, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
-/// Reads FBX geometry from the supplied model and mapping data.
+/// Reads HFMModel from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMModel* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
 class TextureParam {
 public:
@@ -103,12 +103,12 @@ class ExtractedMesh;
 
 class FBXReader {
 public:
-    HFMGeometry* _hfmGeometry;
+    HFMModel* _hfmModel;
 
     FBXNode _rootNode;
     static FBXNode parseFBX(QIODevice* device);
 
-    HFMGeometry* extractHFMGeometry(const QVariantHash& mapping, const QString& url);
+    HFMModel* extractHFMModel(const QVariantHash& mapping, const QString& url);
 
     static ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex, bool deduplicate = true);
     QHash<QString, ExtractedMesh> meshes;
diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp
index 7ee13c5cdf..cc1f3bec1c 100644
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@@ -533,10 +533,10 @@ bool GLTFReader::addTexture(const QJsonObject& object) {
     return true;
 }
 
-bool GLTFReader::parseGLTF(const QByteArray& model) {
+bool GLTFReader::parseGLTF(const QByteArray& data) {
     PROFILE_RANGE_EX(resource_parse, __FUNCTION__, 0xffff0000, nullptr);
     
-    QJsonDocument d = QJsonDocument::fromJson(model);
+    QJsonDocument d = QJsonDocument::fromJson(data);
     QJsonObject jsFile = d.object();
 
     bool isvalid = setAsset(jsFile);
@@ -697,7 +697,7 @@ glm::mat4 GLTFReader::getModelTransform(const GLTFNode& node) {
     return tmat;
 }
 
-bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
+bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
 
     //Build dependencies
     QVector<QVector<int>> nodeDependencies(_file.nodes.size());
@@ -727,17 +727,17 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
     }
     
     //Build default joints
-    geometry.joints.resize(1);
-    geometry.joints[0].isFree = false;
-    geometry.joints[0].parentIndex = -1;
-    geometry.joints[0].distanceToParent = 0;
-    geometry.joints[0].translation = glm::vec3(0, 0, 0);
-    geometry.joints[0].rotationMin = glm::vec3(0, 0, 0);
-    geometry.joints[0].rotationMax = glm::vec3(0, 0, 0);
-    geometry.joints[0].name = "OBJ";
-    geometry.joints[0].isSkeletonJoint = true;
+    model.joints.resize(1);
+    model.joints[0].isFree = false;
+    model.joints[0].parentIndex = -1;
+    model.joints[0].distanceToParent = 0;
+    model.joints[0].translation = glm::vec3(0, 0, 0);
+    model.joints[0].rotationMin = glm::vec3(0, 0, 0);
+    model.joints[0].rotationMax = glm::vec3(0, 0, 0);
+    model.joints[0].name = "OBJ";
+    model.joints[0].isSkeletonJoint = true;
 
-    geometry.jointIndices["x"] = 1;
+    model.jointIndices["x"] = 1;
 
     //Build materials
     QVector<QString> materialIDs;
@@ -750,8 +750,8 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
 
     for (int i = 0; i < materialIDs.size(); i++) {
         QString& matid = materialIDs[i];
-        geometry.materials[matid] = HFMMaterial();
-        HFMMaterial& hfmMaterial = geometry.materials[matid];
+        model.materials[matid] = HFMMaterial();
+        HFMMaterial& hfmMaterial = model.materials[matid];
         hfmMaterial._material = std::make_shared<graphics::Material>();
         setHFMMaterial(hfmMaterial, _file.materials[i]);
     }
@@ -765,8 +765,8 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
         if (node.defined["mesh"]) {
             qCDebug(modelformat) << "node_transforms" << node.transforms;
             foreach(auto &primitive, _file.meshes[node.mesh].primitives) {
-                geometry.meshes.append(HFMMesh());
-                HFMMesh& mesh = geometry.meshes[geometry.meshes.size() - 1];
+                model.meshes.append(HFMMesh());
+                HFMMesh& mesh = model.meshes[model.meshes.size() - 1];
                 HFMCluster cluster;
                 cluster.jointIndex = 0;
                 cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
@@ -886,7 +886,7 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
                 mesh.meshExtents.reset();
                 foreach(const glm::vec3& vertex, mesh.vertices) {
                     mesh.meshExtents.addPoint(vertex);
-                    geometry.meshExtents.addPoint(vertex);
+                    model.meshExtents.addPoint(vertex);
                 }
                 
                 // since mesh.modelTransform seems to not have any effect I apply the transformation the model 
@@ -898,7 +898,7 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
                     }
                 }
 
-                mesh.meshIndex = geometry.meshes.size();
+                mesh.meshIndex = model.meshes.size();
                 FBXReader::buildModelMesh(mesh, url.toString());
             }
             
@@ -910,7 +910,7 @@ bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
     return true;
 }
 
-HFMGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping, 
+HFMModel* GLTFReader::readGLTF(QByteArray& data, const QVariantHash& mapping, 
                                   const QUrl& url, bool loadLightmaps, float lightmapLevel) {
     
     _url = url;
@@ -922,15 +922,15 @@ HFMGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping
         _url = QUrl(QFileInfo(localFileName).absoluteFilePath());
     }
 
-    parseGLTF(model);
+    parseGLTF(data);
     //_file.dump();
-    HFMGeometry* geometryPtr = new HFMGeometry();
-    HFMGeometry& geometry = *geometryPtr;
+    HFMModel* modelPtr = new HFMModel();
+    HFMModel& model = *modelPtr;
 
-    buildGeometry(geometry, url);
+    buildGeometry(model, url);
     
-    //hfmDebugDump(geometry);
-    return geometryPtr;
+    //hfmDebugDump(data);
+    return modelPtr;
     
 }
 
@@ -1181,37 +1181,37 @@ void GLTFReader::retriangulate(const QVector<int>& inIndices, const QVector<glm:
     }
 }
 
-void GLTFReader::hfmDebugDump(const HFMGeometry& hfmgeo) {
-    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
+void GLTFReader::hfmDebugDump(const HFMModel& hfmModel) {
+    qCDebug(modelformat) << "---------------- hfmModel ----------------";
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmModel.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmModel.offset;
 
-    qCDebug(modelformat) << "  leftEyeJointIndex =" << hfmgeo.leftEyeJointIndex;
-    qCDebug(modelformat) << "  rightEyeJointIndex =" << hfmgeo.rightEyeJointIndex;
-    qCDebug(modelformat) << "  neckJointIndex =" << hfmgeo.neckJointIndex;
-    qCDebug(modelformat) << "  rootJointIndex =" << hfmgeo.rootJointIndex;
-    qCDebug(modelformat) << "  leanJointIndex =" << hfmgeo.leanJointIndex;
-    qCDebug(modelformat) << "  headJointIndex =" << hfmgeo.headJointIndex;
-    qCDebug(modelformat) << "  leftHandJointIndex" << hfmgeo.leftHandJointIndex;
-    qCDebug(modelformat) << "  rightHandJointIndex" << hfmgeo.rightHandJointIndex;
-    qCDebug(modelformat) << "  leftToeJointIndex" << hfmgeo.leftToeJointIndex;
-    qCDebug(modelformat) << "  rightToeJointIndex" << hfmgeo.rightToeJointIndex;
-    qCDebug(modelformat) << "  leftEyeSize = " << hfmgeo.leftEyeSize;
-    qCDebug(modelformat) << "  rightEyeSize = " << hfmgeo.rightEyeSize;
+    qCDebug(modelformat) << "  leftEyeJointIndex =" << hfmModel.leftEyeJointIndex;
+    qCDebug(modelformat) << "  rightEyeJointIndex =" << hfmModel.rightEyeJointIndex;
+    qCDebug(modelformat) << "  neckJointIndex =" << hfmModel.neckJointIndex;
+    qCDebug(modelformat) << "  rootJointIndex =" << hfmModel.rootJointIndex;
+    qCDebug(modelformat) << "  leanJointIndex =" << hfmModel.leanJointIndex;
+    qCDebug(modelformat) << "  headJointIndex =" << hfmModel.headJointIndex;
+    qCDebug(modelformat) << "  leftHandJointIndex" << hfmModel.leftHandJointIndex;
+    qCDebug(modelformat) << "  rightHandJointIndex" << hfmModel.rightHandJointIndex;
+    qCDebug(modelformat) << "  leftToeJointIndex" << hfmModel.leftToeJointIndex;
+    qCDebug(modelformat) << "  rightToeJointIndex" << hfmModel.rightToeJointIndex;
+    qCDebug(modelformat) << "  leftEyeSize = " << hfmModel.leftEyeSize;
+    qCDebug(modelformat) << "  rightEyeSize = " << hfmModel.rightEyeSize;
 
-    qCDebug(modelformat) << "  palmDirection = " << hfmgeo.palmDirection;
+    qCDebug(modelformat) << "  palmDirection = " << hfmModel.palmDirection;
 
-    qCDebug(modelformat) << "  neckPivot = " << hfmgeo.neckPivot;
+    qCDebug(modelformat) << "  neckPivot = " << hfmModel.neckPivot;
 
-    qCDebug(modelformat) << "  bindExtents.size() = " << hfmgeo.bindExtents.size();
-    qCDebug(modelformat) << "  meshExtents.size() = " << hfmgeo.meshExtents.size();
+    qCDebug(modelformat) << "  bindExtents.size() = " << hfmModel.bindExtents.size();
+    qCDebug(modelformat) << "  meshExtents.size() = " << hfmModel.meshExtents.size();
 
-    qCDebug(modelformat) << "  jointIndices.size() =" << hfmgeo.jointIndices.size();
-    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices.size() =" << hfmModel.jointIndices.size();
+    qCDebug(modelformat) << "  joints.count() =" << hfmModel.joints.count();
     qCDebug(modelformat) << "---------------- Meshes ----------------";
-    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
-    qCDebug(modelformat) << "  blendshapeChannelNames = " << hfmgeo.blendshapeChannelNames;
-    foreach(HFMMesh mesh, hfmgeo.meshes) {
+    qCDebug(modelformat) << "  meshes.count() =" << hfmModel.meshes.count();
+    qCDebug(modelformat) << "  blendshapeChannelNames = " << hfmModel.blendshapeChannelNames;
+    foreach(HFMMesh mesh, hfmModel.meshes) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    meshpointer =" << mesh._mesh.get();
         qCDebug(modelformat) << "    meshindex =" << mesh.meshIndex;
@@ -1254,18 +1254,18 @@ void GLTFReader::hfmDebugDump(const HFMGeometry& hfmgeo) {
         qCDebug(modelformat) << "\n";
     }
     qCDebug(modelformat) << "---------------- AnimationFrames ----------------";
-    foreach(HFMAnimationFrame anim, hfmgeo.animationFrames) {
+    foreach(HFMAnimationFrame anim, hfmModel.animationFrames) {
         qCDebug(modelformat) << "  anim.translations = " << anim.translations;
         qCDebug(modelformat) << "  anim.rotations = " << anim.rotations;
     }
-    QList<int> mitomona_keys = hfmgeo.meshIndicesToModelNames.keys();
+    QList<int> mitomona_keys = hfmModel.meshIndicesToModelNames.keys();
     foreach(int key, mitomona_keys) {
-        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << hfmgeo.meshIndicesToModelNames[key];
+        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << hfmModel.meshIndicesToModelNames[key];
     }
 
     qCDebug(modelformat) << "---------------- Materials ----------------";
 
-    foreach(HFMMaterial mat, hfmgeo.materials) {
+    foreach(HFMMaterial mat, hfmModel.materials) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "  mat.materialID =" << mat.materialID;
         qCDebug(modelformat) << "  diffuseColor =" << mat.diffuseColor;
@@ -1314,7 +1314,7 @@ void GLTFReader::hfmDebugDump(const HFMGeometry& hfmgeo) {
 
     qCDebug(modelformat) << "---------------- Joints ----------------";
 
-    foreach(HFMJoint joint, hfmgeo.joints) {
+    foreach(HFMJoint joint, hfmModel.joints) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    shapeInfo.avgPoint =" << joint.shapeInfo.avgPoint;
         qCDebug(modelformat) << "    shapeInfo.debugLines =" << joint.shapeInfo.debugLines;
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index 17229c3554..544c85f1c1 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -706,7 +706,7 @@ class GLTFReader : public QObject {
     Q_OBJECT
 public:
     GLTFReader();
-    HFMGeometry* readGLTF(QByteArray& model, const QVariantHash& mapping, 
+    HFMModel* readGLTF(QByteArray& model, const QVariantHash& mapping, 
                           const QUrl& url, bool loadLightmaps = true, float lightmapLevel = 1.0f);
 private:
     GLTFFile _file;
@@ -714,8 +714,8 @@ private:
 
     glm::mat4 getModelTransform(const GLTFNode& node);
 
-    bool buildGeometry(HFMGeometry& geometry, const QUrl& url);
-    bool parseGLTF(const QByteArray& model);
+    bool buildGeometry(HFMModel& model, const QUrl& url);
+    bool parseGLTF(const QByteArray& data);
     
     bool getStringVal(const QJsonObject& object, const QString& fieldname, 
                       QString& value, QMap<QString, bool>&  defined);
@@ -780,7 +780,7 @@ private:
 
     void setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material);
     HFMTexture getHFMTexture(const GLTFTexture& texture);
-    void hfmDebugDump(const HFMGeometry& hfmgeo);
+    void hfmDebugDump(const HFMModel& hfmModel);
 };
 
 #endif // hifi_GLTFReader_h
\ No newline at end of file
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index fcfef5fe01..a37359aa2a 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -488,10 +488,10 @@ QNetworkReply* request(QUrl& url, bool isTest) {
 }
 
 
-bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
+bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& model,
                               float& scaleGuess, bool combineParts) {
     FaceGroup faces;
-    HFMMesh& mesh = geometry.meshes[0];
+    HFMMesh& mesh = model.meshes[0];
     mesh.parts.append(HFMMeshPart());
     HFMMeshPart& meshPart = mesh.parts.last();
     bool sawG = false;
@@ -652,41 +652,41 @@ done:
 }
 
 
-HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
+HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
     PROFILE_RANGE_EX(resource_parse, __FUNCTION__, 0xffff0000, nullptr);
-    QBuffer buffer { &model };
+    QBuffer buffer { &data };
     buffer.open(QIODevice::ReadOnly);
 
-    auto geometryPtr { std::make_shared<HFMGeometry>() };
-    HFMGeometry& geometry { *geometryPtr };
+    auto modelPtr { std::make_shared<HFMModel>() };
+    HFMModel& model { *modelPtr };
     OBJTokenizer tokenizer { &buffer };
     float scaleGuess = 1.0f;
 
     bool needsMaterialLibrary = false;
 
     _url = url;
-    geometry.meshExtents.reset();
-    geometry.meshes.append(HFMMesh());
+    model.meshExtents.reset();
+    model.meshes.append(HFMMesh());
 
     try {
         // call parseOBJGroup as long as it's returning true.  Each successful call will
-        // add a new meshPart to the geometry's single mesh.
-        while (parseOBJGroup(tokenizer, mapping, geometry, scaleGuess, combineParts)) {}
+        // add a new meshPart to the model's single mesh.
+        while (parseOBJGroup(tokenizer, mapping, model, scaleGuess, combineParts)) {}
 
-        HFMMesh& mesh = geometry.meshes[0];
+        HFMMesh& mesh = model.meshes[0];
         mesh.meshIndex = 0;
 
-        geometry.joints.resize(1);
-        geometry.joints[0].isFree = false;
-        geometry.joints[0].parentIndex = -1;
-        geometry.joints[0].distanceToParent = 0;
-        geometry.joints[0].translation = glm::vec3(0, 0, 0);
-        geometry.joints[0].rotationMin = glm::vec3(0, 0, 0);
-        geometry.joints[0].rotationMax = glm::vec3(0, 0, 0);
-        geometry.joints[0].name = "OBJ";
-        geometry.joints[0].isSkeletonJoint = true;
+        model.joints.resize(1);
+        model.joints[0].isFree = false;
+        model.joints[0].parentIndex = -1;
+        model.joints[0].distanceToParent = 0;
+        model.joints[0].translation = glm::vec3(0, 0, 0);
+        model.joints[0].rotationMin = glm::vec3(0, 0, 0);
+        model.joints[0].rotationMax = glm::vec3(0, 0, 0);
+        model.joints[0].name = "OBJ";
+        model.joints[0].isSkeletonJoint = true;
 
-        geometry.jointIndices["x"] = 1;
+        model.jointIndices["x"] = 1;
 
         HFMCluster cluster;
         cluster.jointIndex = 0;
@@ -818,13 +818,13 @@ HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         mesh.meshExtents.reset();
         foreach(const glm::vec3& vertex, mesh.vertices) {
             mesh.meshExtents.addPoint(vertex);
-            geometry.meshExtents.addPoint(vertex);
+            model.meshExtents.addPoint(vertex);
         }
 
         // Build the single mesh.
         FBXReader::buildModelMesh(mesh, url.toString());
 
-        // hfmDebugDump(geometry);
+        // hfmDebugDump(model);
     } catch(const std::exception& e) {
         qCDebug(modelformat) << "OBJ reader fail: " << e.what();
     }
@@ -885,12 +885,12 @@ HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         if (!objMaterial.used) {
             continue;
         }
-        geometry.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
+        model.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
                                                      objMaterial.specularColor,
                                                      objMaterial.emissiveColor,
                                                      objMaterial.shininess,
                                                      objMaterial.opacity);
-        HFMMaterial& hfmMaterial = geometry.materials[materialID];
+        HFMMaterial& hfmMaterial = model.materials[materialID];
         hfmMaterial.materialID = materialID;
         hfmMaterial._material = std::make_shared<graphics::Material>();
         graphics::MaterialPointer modelMaterial = hfmMaterial._material;
@@ -988,15 +988,15 @@ HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         modelMaterial->setOpacity(hfmMaterial.opacity);
     }
 
-    return geometryPtr;
+    return modelPtr;
 }
 
-void hfmDebugDump(const HFMGeometry& hfmgeo) {
-    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
-    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
-    foreach (HFMMesh mesh, hfmgeo.meshes) {
+void hfmDebugDump(const HFMModel& hfmModel) {
+    qCDebug(modelformat) << "---------------- hfmModel ----------------";
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmModel.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmModel.offset;
+    qCDebug(modelformat) << "  meshes.count() =" << hfmModel.meshes.count();
+    foreach (HFMMesh mesh, hfmModel.meshes) {
         qCDebug(modelformat) << "    vertices.count() =" << mesh.vertices.count();
         qCDebug(modelformat) << "    colors.count() =" << mesh.colors.count();
         qCDebug(modelformat) << "    normals.count() =" << mesh.normals.count();
@@ -1037,10 +1037,10 @@ void hfmDebugDump(const HFMGeometry& hfmgeo) {
         }
     }
 
-    qCDebug(modelformat) << "  jointIndices =" << hfmgeo.jointIndices;
-    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices =" << hfmModel.jointIndices;
+    qCDebug(modelformat) << "  joints.count() =" << hfmModel.joints.count();
 
-    foreach (HFMJoint joint, hfmgeo.joints) {
+    foreach (HFMJoint joint, hfmModel.joints) {
         qCDebug(modelformat) << "    isFree =" << joint.isFree;
         qCDebug(modelformat) << "    freeLineage" << joint.freeLineage;
         qCDebug(modelformat) << "    parentIndex" << joint.parentIndex;
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 2eb039eba2..1b259d90df 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -87,13 +87,13 @@ public:
     QString currentMaterialName;
     QHash<QString, OBJMaterial> materials;
 
-    HFMGeometry::Pointer readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
+    HFMModel::Pointer readOBJ(QByteArray& data, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
 
 private:
     QUrl _url;
 
     QHash<QByteArray, bool> librariesSeen;
-    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
+    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& model,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
@@ -104,4 +104,4 @@ private:
 
 // What are these utilities doing here? One is used by fbx loading code in VHACD Utils, and the other a general debugging utility.
 void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID);
-void hfmDebugDump(const HFMGeometry& hfmgeo);
+void hfmDebugDump(const HFMModel& hfmModel);
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index a950e1df3c..6430e4599e 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -128,7 +128,7 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
 
 void GeometryMappingResource::onGeometryMappingLoaded(bool success) {
     if (success && _geometryResource) {
-        _hfmGeometry = _geometryResource->_hfmGeometry;
+        _hfmModel = _geometryResource->_hfmModel;
         _meshParts = _geometryResource->_meshParts;
         _meshes = _geometryResource->_meshes;
         _materials = _geometryResource->_materials;
@@ -193,38 +193,38 @@ void GeometryReader::run() {
                 _url.path().toLower().endsWith(".obj.gz") ||
                 _url.path().toLower().endsWith(".gltf"))) {
 
-            HFMGeometry::Pointer hfmGeometry;
+            HFMModel::Pointer hfmModel;
 
             if (_url.path().toLower().endsWith(".fbx")) {
-                hfmGeometry.reset(readFBX(_data, _mapping, _url.path()));
-                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
+                hfmModel.reset(readFBX(_data, _mapping, _url.path()));
+                if (hfmModel->meshes.size() == 0 && hfmModel->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported FBX version");
                 }
             } else if (_url.path().toLower().endsWith(".obj")) {
-                hfmGeometry = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
+                hfmModel = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
             } else if (_url.path().toLower().endsWith(".obj.gz")) {
                 QByteArray uncompressedData;
                 if (gunzip(_data, uncompressedData)){
-                    hfmGeometry = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
+                    hfmModel = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
                 } else {
                     throw QString("failed to decompress .obj.gz");
                 }
 
             } else if (_url.path().toLower().endsWith(".gltf")) {
                 std::shared_ptr<GLTFReader> glreader = std::make_shared<GLTFReader>();
-                hfmGeometry.reset(glreader->readGLTF(_data, _mapping, _url));
-                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
+                hfmModel.reset(glreader->readGLTF(_data, _mapping, _url));
+                if (hfmModel->meshes.size() == 0 && hfmModel->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported GLTF version");
                 }
             } else {
                 throw QString("unsupported format");
             }
 
-            // Add scripts to hfmGeometry
+            // Add scripts to hfmModel
             if (!_mapping.value(SCRIPT_FIELD).isNull()) {
                 QVariantList scripts = _mapping.values(SCRIPT_FIELD);
                 for (auto &script : scripts) {
-                    hfmGeometry->scripts.push_back(script.toString());
+                    hfmModel->scripts.push_back(script.toString());
                 }
             }
 
@@ -234,7 +234,7 @@ void GeometryReader::run() {
                 qCWarning(modelnetworking) << "Abandoning load of" << _url << "; could not get strong ref";
             } else {
                 QMetaObject::invokeMethod(resource.data(), "setGeometryDefinition",
-                    Q_ARG(HFMGeometry::Pointer, hfmGeometry));
+                    Q_ARG(HFMModel::Pointer, hfmModel));
             }
         } else {
             throw QString("url is invalid");
@@ -262,7 +262,7 @@ public:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected:
-    Q_INVOKABLE void setGeometryDefinition(HFMGeometry::Pointer hfmGeometry);
+    Q_INVOKABLE void setGeometryDefinition(HFMModel::Pointer hfmModel);
 
 private:
     QVariantHash _mapping;
@@ -277,13 +277,13 @@ void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
     QThreadPool::globalInstance()->start(new GeometryReader(_self, _effectiveBaseURL, _mapping, data, _combineParts));
 }
 
-void GeometryDefinitionResource::setGeometryDefinition(HFMGeometry::Pointer hfmGeometry) {
-    // Assume ownership of the geometry pointer
-    _hfmGeometry = hfmGeometry;
+void GeometryDefinitionResource::setGeometryDefinition(HFMModel::Pointer hfmModel) {
+    // Assume ownership of the HFMModel pointer
+    _hfmModel = hfmModel;
 
     // Copy materials
     QHash<QString, size_t> materialIDAtlas;
-    for (const HFMMaterial& material : _hfmGeometry->materials) {
+    for (const HFMMaterial& material : _hfmModel->materials) {
         materialIDAtlas[material.materialID] = _materials.size();
         _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
     }
@@ -291,7 +291,7 @@ void GeometryDefinitionResource::setGeometryDefinition(HFMGeometry::Pointer hfmG
     std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
     std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
     int meshID = 0;
-    for (const HFMMesh& mesh : _hfmGeometry->meshes) {
+    for (const HFMMesh& mesh : _hfmModel->meshes) {
         // Copy mesh pointers
         meshes->emplace_back(mesh._mesh);
         int partID = 0;
@@ -371,7 +371,7 @@ const QVariantMap Geometry::getTextures() const {
 
 // FIXME: The materials should only be copied when modified, but the Model currently caches the original
 Geometry::Geometry(const Geometry& geometry) {
-    _hfmGeometry = geometry._hfmGeometry;
+    _hfmModel = geometry._hfmModel;
     _meshes = geometry._meshes;
     _meshParts = geometry._meshParts;
 
@@ -444,8 +444,8 @@ void GeometryResource::deleter() {
 }
 
 void GeometryResource::setTextures() {
-    if (_hfmGeometry) {
-        for (const HFMMaterial& material : _hfmGeometry->materials) {
+    if (_hfmModel) {
+        for (const HFMMaterial& material : _hfmModel->materials) {
             _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
         }
     }
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 2283c355d8..1bb340b83c 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -45,9 +45,9 @@ public:
     // Mutable, but must retain structure of vector
     using NetworkMaterials = std::vector<std::shared_ptr<NetworkMaterial>>;
 
-    bool isGeometryLoaded() const { return (bool)_hfmGeometry; }
+    bool isHFMModelLoaded() const { return (bool)_hfmModel; }
 
-    const HFMGeometry& getHFMGeometry() const { return *_hfmGeometry; }
+    const HFMModel& getHFMModel() const { return *_hfmModel; }
     const GeometryMeshes& getMeshes() const { return *_meshes; }
     const std::shared_ptr<NetworkMaterial> getShapeMaterial(int shapeID) const;
 
@@ -62,7 +62,7 @@ protected:
     friend class GeometryMappingResource;
 
     // Shared across all geometries, constant throughout lifetime
-    std::shared_ptr<const HFMGeometry> _hfmGeometry;
+    std::shared_ptr<const HFMModel> _hfmModel;
     std::shared_ptr<const GeometryMeshes> _meshes;
     std::shared_ptr<const GeometryMeshParts> _meshParts;
 
@@ -94,7 +94,7 @@ protected:
 
     // Geometries may not hold onto textures while cached - that is for the texture cache
     // Instead, these methods clear and reset textures from the geometry when caching/loading
-    bool shouldSetTextures() const { return _hfmGeometry && _materials.empty(); }
+    bool shouldSetTextures() const { return _hfmModel && _materials.empty(); }
     void setTextures();
     void resetTextures();
 
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 31d6cef060..c31345bc55 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -32,8 +32,8 @@ bool CauterizedModel::updateGeometry() {
     bool needsFullUpdate = Model::updateGeometry();
     if (_isCauterized && needsFullUpdate) {
         assert(_cauterizeMeshStates.empty());
-        const HFMGeometry& hfmGeometry = getHFMGeometry();
-        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
+        const HFMModel& hfmModel = getHFMModel();
+        foreach (const HFMMesh& mesh, hfmModel.meshes) {
             Model::MeshState state;
             if (_useDualQuaternionSkinning) {
                 state.clusterDualQuaternions.resize(mesh.clusters.size());
@@ -76,7 +76,7 @@ void CauterizedModel::createRenderItemSet() {
         // Run through all of the meshes, and place them into their segregated, but unsorted buckets
         int shapeID = 0;
         uint32_t numMeshes = (uint32_t)meshes.size();
-        const HFMGeometry& hfmGeometry = getHFMGeometry();
+        const HFMModel& hfmModel = getHFMModel();
         for (uint32_t i = 0; i < numMeshes; i++) {
             const auto& mesh = meshes.at(i);
             if (!mesh) {
@@ -86,7 +86,7 @@ void CauterizedModel::createRenderItemSet() {
             // Create the render payloads
             int numParts = (int)mesh->getNumParts();
             for (int partIndex = 0; partIndex < numParts; partIndex++) {
-                initializeBlendshapes(hfmGeometry.meshes[i], i);
+                initializeBlendshapes(hfmModel.meshes[i], i);
 
                 auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
                 _modelMeshRenderItems << std::static_pointer_cast<ModelMeshPartPayload>(ptr);
@@ -109,11 +109,11 @@ void CauterizedModel::updateClusterMatrices() {
         return;
     }
     _needsUpdateClusterMatrices = false;
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
 
     for (int i = 0; i < (int)_meshStates.size(); i++) {
         Model::MeshState& state = _meshStates[i];
-        const HFMMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = hfmModel.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
             const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
@@ -133,7 +133,7 @@ void CauterizedModel::updateClusterMatrices() {
     // as an optimization, don't build cautrizedClusterMatrices if the boneSet is empty.
     if (!_cauterizeBoneSet.empty()) {
 
-        AnimPose cauterizePose = _rig.getJointPose(geometry.neckJointIndex);
+        AnimPose cauterizePose = _rig.getJointPose(hfmModel.neckJointIndex);
         cauterizePose.scale() = glm::vec3(0.0001f, 0.0001f, 0.0001f);
 
         static const glm::mat4 zeroScale(
@@ -141,11 +141,11 @@ void CauterizedModel::updateClusterMatrices() {
             glm::vec4(0.0f, 0.0001f, 0.0f, 0.0f),
             glm::vec4(0.0f, 0.0f, 0.0001f, 0.0f),
             glm::vec4(0.0f, 0.0f, 0.0f, 1.0f));
-        auto cauterizeMatrix = _rig.getJointTransform(geometry.neckJointIndex) * zeroScale;
+        auto cauterizeMatrix = _rig.getJointTransform(hfmModel.neckJointIndex) * zeroScale;
 
         for (int i = 0; i < _cauterizeMeshStates.size(); i++) {
             Model::MeshState& state = _cauterizeMeshStates[i];
-            const HFMMesh& mesh = geometry.meshes.at(i);
+            const HFMMesh& mesh = hfmModel.meshes.at(i);
 
             for (int j = 0; j < mesh.clusters.size(); j++) {
                 const HFMCluster& cluster = mesh.clusters.at(j);
@@ -175,7 +175,7 @@ void CauterizedModel::updateClusterMatrices() {
 
     // post the blender if we're not currently waiting for one to finish
     auto modelBlender = DependencyManager::get<ModelBlender>();
-    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
+    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && hfmModel.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
         _blendedBlendshapeCoefficients = _blendshapeCoefficients;
         modelBlender->noteRequiresBlend(getThisPointer());
     }
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 8e2541fdda..b493780aff 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -260,8 +260,8 @@ void ModelMeshPartPayload::initCache(const ModelPointer& model) {
         _hasColorAttrib = vertexFormat->hasAttribute(gpu::Stream::COLOR);
         _isSkinned = vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_WEIGHT) && vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_INDEX);
 
-        const HFMGeometry& geometry = model->getHFMGeometry();
-        const HFMMesh& mesh = geometry.meshes.at(_meshIndex);
+        const HFMModel& hfmModel = model->getHFMModel();
+        const HFMMesh& mesh = hfmModel.meshes.at(_meshIndex);
 
         _isBlendShaped = !mesh.blendshapes.isEmpty();
         _hasTangents = !mesh.tangents.isEmpty();
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 65b3fef7c0..6f285a9f0c 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -183,11 +183,11 @@ bool Model::shouldInvalidatePayloadShapeKey(int meshIndex) {
         return true;
     }
 
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
     const auto& networkMeshes = getGeometry()->getMeshes();
     // if our index is ever out of range for either meshes or networkMeshes, then skip it, and set our _meshGroupsKnown
     // to false to rebuild out mesh groups.
-    if (meshIndex < 0 || meshIndex >= (int)networkMeshes.size() || meshIndex >= (int)geometry.meshes.size() || meshIndex >= (int)_meshStates.size()) {
+    if (meshIndex < 0 || meshIndex >= (int)networkMeshes.size() || meshIndex >= (int)hfmModel.meshes.size() || meshIndex >= (int)_meshStates.size()) {
         _needsFixupInScene = true;     // trigger remove/add cycle
         invalidCalculatedMeshBoxes();  // if we have to reload, we need to assume our mesh boxes are all invalid
         return true;
@@ -278,8 +278,8 @@ void Model::setRenderItemsNeedUpdate() {
 
 void Model::reset() {
     if (isLoaded()) {
-        const HFMGeometry& geometry = getHFMGeometry();
-        _rig.reset(geometry);
+        const HFMModel& hfmModel = getHFMModel();
+        _rig.reset(hfmModel);
         emit rigReset();
         emit rigReady();
     }
@@ -295,13 +295,13 @@ bool Model::updateGeometry() {
     _needsReload = false;
 
     // TODO: should all Models have a valid _rig?
-    if (_rig.jointStatesEmpty() && getHFMGeometry().joints.size() > 0) {
+    if (_rig.jointStatesEmpty() && getHFMModel().joints.size() > 0) {
         initJointStates();
         assert(_meshStates.empty());
 
-        const HFMGeometry& hfmGeometry = getHFMGeometry();
+        const HFMModel& hfmModel = getHFMModel();
         int i = 0;
-        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
+        foreach (const HFMMesh& mesh, hfmModel.meshes) {
             MeshState state;
             state.clusterDualQuaternions.resize(mesh.clusters.size());
             state.clusterMatrices.resize(mesh.clusters.size());
@@ -319,10 +319,10 @@ bool Model::updateGeometry() {
 
 // virtual
 void Model::initJointStates() {
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
 
-    _rig.initJointStates(geometry, modelOffset);
+    _rig.initJointStates(hfmModel, modelOffset);
 }
 
 bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const glm::vec3& direction, float& distance,
@@ -363,9 +363,9 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const HFMGeometry& geometry = getHFMGeometry();
+        const HFMModel& hfmModel = getHFMModel();
         if (!_triangleSetsValid) {
-            calculateTriangleSets(geometry);
+            calculateTriangleSets(hfmModel);
         }
 
         glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
@@ -448,7 +448,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
             extraInfo["shapeID"] = bestShapeID;
             if (pickAgainstTriangles) {
                 extraInfo["subMeshIndex"] = bestSubMeshIndex;
-                extraInfo["subMeshName"] = geometry.getModelNameOfMesh(bestSubMeshIndex);
+                extraInfo["subMeshName"] = hfmModel.getModelNameOfMesh(bestSubMeshIndex);
                 extraInfo["subMeshTriangleWorld"] = QVariantMap{
                     { "v0", vec3toVariant(bestWorldTriangle.v0) },
                     { "v1", vec3toVariant(bestWorldTriangle.v1) },
@@ -506,9 +506,9 @@ bool Model::findParabolaIntersectionAgainstSubMeshes(const glm::vec3& origin, co
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const HFMGeometry& geometry = getHFMGeometry();
+        const HFMModel& hfmModel = getHFMModel();
         if (!_triangleSetsValid) {
-            calculateTriangleSets(geometry);
+            calculateTriangleSets(hfmModel);
         }
 
         glm::mat4 meshToModelMatrix = glm::scale(_scale) * glm::translate(_offset);
@@ -595,7 +595,7 @@ bool Model::findParabolaIntersectionAgainstSubMeshes(const glm::vec3& origin, co
             extraInfo["shapeID"] = bestShapeID;
             if (pickAgainstTriangles) {
                 extraInfo["subMeshIndex"] = bestSubMeshIndex;
-                extraInfo["subMeshName"] = geometry.getModelNameOfMesh(bestSubMeshIndex);
+                extraInfo["subMeshName"] = hfmModel.getModelNameOfMesh(bestSubMeshIndex);
                 extraInfo["subMeshTriangleWorld"] = QVariantMap{
                     { "v0", vec3toVariant(bestWorldTriangle.v0) },
                     { "v1", vec3toVariant(bestWorldTriangle.v1) },
@@ -641,7 +641,7 @@ bool Model::convexHullContains(glm::vec3 point) {
         QMutexLocker locker(&_mutex);
 
         if (!_triangleSetsValid) {
-            calculateTriangleSets(getHFMGeometry());
+            calculateTriangleSets(getHFMModel());
         }
 
         // If we are inside the models box, then consider the submeshes...
@@ -753,7 +753,7 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
     }
     // update triangles for picking
     {
-        HFMGeometry geometry;
+        HFMModel hfmModel;
         for (const auto& newMesh : meshes) {
             HFMMesh mesh;
             mesh._mesh = newMesh.getMeshPointer();
@@ -767,15 +767,15 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
             {
                 foreach (const glm::vec3& vertex, mesh.vertices) {
                     glm::vec3 transformedVertex = glm::vec3(mesh.modelTransform * glm::vec4(vertex, 1.0f));
-                    geometry.meshExtents.minimum = glm::min(geometry.meshExtents.minimum, transformedVertex);
-                    geometry.meshExtents.maximum = glm::max(geometry.meshExtents.maximum, transformedVertex);
+                    hfmModel.meshExtents.minimum = glm::min(hfmModel.meshExtents.minimum, transformedVertex);
+                    hfmModel.meshExtents.maximum = glm::max(hfmModel.meshExtents.maximum, transformedVertex);
                     mesh.meshExtents.minimum = glm::min(mesh.meshExtents.minimum, transformedVertex);
                     mesh.meshExtents.maximum = glm::max(mesh.meshExtents.maximum, transformedVertex);
                 }
             }
-            geometry.meshes << mesh;
+            hfmModel.meshes << mesh;
         }
-        calculateTriangleSets(geometry);
+        calculateTriangleSets(hfmModel);
     }
     return true;
 }
@@ -789,11 +789,11 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
         return result;
     }
 
-    const HFMGeometry& geometry = getHFMGeometry();
-    int numberOfMeshes = geometry.meshes.size();
+    const HFMModel& hfmModel = getHFMModel();
+    int numberOfMeshes = hfmModel.meshes.size();
     int shapeID = 0;
     for (int i = 0; i < numberOfMeshes; i++) {
-        const HFMMesh& hfmMesh = geometry.meshes.at(i);
+        const HFMMesh& hfmMesh = hfmModel.meshes.at(i);
         if (auto mesh = hfmMesh._mesh) {
             result.append(mesh);
 
@@ -808,17 +808,17 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
     return result;
 }
 
-void Model::calculateTriangleSets(const HFMGeometry& geometry) {
+void Model::calculateTriangleSets(const HFMModel& hfmModel) {
     PROFILE_RANGE(render, __FUNCTION__);
 
-    int numberOfMeshes = geometry.meshes.size();
+    int numberOfMeshes = hfmModel.meshes.size();
 
     _triangleSetsValid = true;
     _modelSpaceMeshTriangleSets.clear();
     _modelSpaceMeshTriangleSets.resize(numberOfMeshes);
 
     for (int i = 0; i < numberOfMeshes; i++) {
-        const HFMMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = hfmModel.meshes.at(i);
 
         const int numberOfParts = mesh.parts.size();
         auto& meshTriangleSets = _modelSpaceMeshTriangleSets[i];
@@ -839,7 +839,7 @@ void Model::calculateTriangleSets(const HFMGeometry& geometry) {
             int totalTriangles = (numberOfQuads * TRIANGLES_PER_QUAD) + numberOfTris;
             partTriangleSet.reserve(totalTriangles);
 
-            auto meshTransform = geometry.offset * mesh.modelTransform;
+            auto meshTransform = hfmModel.offset * mesh.modelTransform;
 
             if (part.quadIndices.size() > 0) {
                 int vIndex = 0;
@@ -1114,7 +1114,7 @@ Extents Model::getBindExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& bindExtents = getHFMGeometry().bindExtents;
+    const Extents& bindExtents = getHFMModel().bindExtents;
     Extents scaledExtents = { bindExtents.minimum * _scale, bindExtents.maximum * _scale };
     return scaledExtents;
 }
@@ -1128,12 +1128,12 @@ Extents Model::getMeshExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& extents = getHFMGeometry().meshExtents;
+    const Extents& extents = getHFMModel().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMModel().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMModel().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum * _scale, maximum * _scale };
     return scaledExtents;
 }
@@ -1143,12 +1143,12 @@ Extents Model::getUnscaledMeshExtents() const {
         return Extents();
     }
 
-    const Extents& extents = getHFMGeometry().meshExtents;
+    const Extents& extents = getHFMModel().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMModel().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMModel().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum, maximum };
 
     return scaledExtents;
@@ -1171,11 +1171,11 @@ void Model::setJointTranslation(int index, bool valid, const glm::vec3& translat
 }
 
 int Model::getParentJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).parentIndex : -1;
+    return (isActive() && jointIndex != -1) ? getHFMModel().joints.at(jointIndex).parentIndex : -1;
 }
 
 int Model::getLastFreeJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).freeLineage.last() : -1;
+    return (isActive() && jointIndex != -1) ? getHFMModel().joints.at(jointIndex).freeLineage.last() : -1;
 }
 
 void Model::setTextures(const QVariantMap& textures) {
@@ -1275,7 +1275,7 @@ QStringList Model::getJointNames() const {
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
-    return isActive() ? getHFMGeometry().getJointNames() : QStringList();
+    return isActive() ? getHFMModel().getJointNames() : QStringList();
 }
 
 void Model::setScaleToFit(bool scaleToFit, const glm::vec3& dimensions, bool forceRescale) {
@@ -1415,10 +1415,10 @@ void Model::updateClusterMatrices() {
     }
 
     _needsUpdateClusterMatrices = false;
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const HFMMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = hfmModel.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
             const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
@@ -1436,7 +1436,7 @@ void Model::updateClusterMatrices() {
 
     // post the blender if we're not currently waiting for one to finish
     auto modelBlender = DependencyManager::get<ModelBlender>();
-    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
+    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && hfmModel.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
         _blendedBlendshapeCoefficients = _blendshapeCoefficients;
         modelBlender->noteRequiresBlend(getThisPointer());
     }
@@ -1505,7 +1505,7 @@ void Model::createRenderItemSet() {
     // Run through all of the meshes, and place them into their segregated, but unsorted buckets
     int shapeID = 0;
     uint32_t numMeshes = (uint32_t)meshes.size();
-    auto& hfmGeometry = getHFMGeometry();
+    auto& hfmModel = getHFMModel();
     for (uint32_t i = 0; i < numMeshes; i++) {
         const auto& mesh = meshes.at(i);
         if (!mesh) {
@@ -1515,7 +1515,7 @@ void Model::createRenderItemSet() {
         // Create the render payloads
         int numParts = (int)mesh->getNumParts();
         for (int partIndex = 0; partIndex < numParts; partIndex++) {
-            initializeBlendshapes(hfmGeometry.meshes[i], i);
+            initializeBlendshapes(hfmModel.meshes[i], i);
             _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
             auto material = getGeometry()->getShapeMaterial(shapeID);
             _modelMeshMaterialNames.push_back(material ? material->getName() : "");
@@ -1600,7 +1600,7 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
 class CollisionRenderGeometry : public Geometry {
 public:
     CollisionRenderGeometry(graphics::MeshPointer mesh) {
-        _hfmGeometry = std::make_shared<HFMGeometry>();
+        _hfmModel = std::make_shared<HFMModel>();
         std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
         meshes->push_back(mesh);
         _meshes = meshes;
@@ -1656,7 +1656,7 @@ void Blender::run() {
     if (_model && _model->isLoaded()) {
         DETAILED_PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } });
         int offset = 0;
-        auto meshes = _model->getHFMGeometry().meshes;
+        auto meshes = _model->getHFMModel().meshes;
         int meshIndex = 0;
         foreach(const HFMMesh& mesh, meshes) {
             auto modelMeshBlendshapeOffsets = _model->_blendshapeOffsets.find(meshIndex++);
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index db5625b3d8..93a0626d28 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -163,7 +163,7 @@ public:
 
     bool maybeStartBlender();
 
-    bool isLoaded() const { return (bool)_renderGeometry && _renderGeometry->isGeometryLoaded(); }
+    bool isLoaded() const { return (bool)_renderGeometry && _renderGeometry->isHFMModelLoaded(); }
     bool isAddedToScene() const { return _addedToScene; }
 
     void setIsWireframe(bool isWireframe) { _isWireframe = isWireframe; }
@@ -184,8 +184,8 @@ public:
     Q_INVOKABLE virtual void setTextures(const QVariantMap& textures);
 
     /// Provided as a convenience, will crash if !isLoaded()
-    // And so that getGeometry() isn't chained everywhere
-    const HFMGeometry& getHFMGeometry() const { assert(isLoaded()); return _renderGeometry->getHFMGeometry(); }
+    // And so that getHFMModel() isn't chained everywhere
+    const HFMModel& getHFMModel() const { assert(isLoaded()); return _renderGeometry->getHFMModel(); }
 
     bool isActive() const { return isLoaded(); }
 
@@ -450,7 +450,7 @@ protected:
 
     bool _overrideModelTransform { false };
     bool _triangleSetsValid { false };
-    void calculateTriangleSets(const HFMGeometry& geometry);
+    void calculateTriangleSets(const HFMModel& hfmModel);
     std::vector<std::vector<TriangleSet>> _modelSpaceMeshTriangleSets; // model space triangles for all sub meshes
 
     virtual void createRenderItemSet();
diff --git a/libraries/render-utils/src/SoftAttachmentModel.cpp b/libraries/render-utils/src/SoftAttachmentModel.cpp
index 77b09caa1d..f26bad86b0 100644
--- a/libraries/render-utils/src/SoftAttachmentModel.cpp
+++ b/libraries/render-utils/src/SoftAttachmentModel.cpp
@@ -41,11 +41,11 @@ void SoftAttachmentModel::updateClusterMatrices() {
 
     _needsUpdateClusterMatrices = false;
 
-    const HFMGeometry& geometry = getHFMGeometry();
+    const HFMModel& hfmModel = getHFMModel();
 
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const HFMMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = hfmModel.meshes.at(i);
 
         for (int j = 0; j < mesh.clusters.size(); j++) {
             const HFMCluster& cluster = mesh.clusters.at(j);
@@ -78,7 +78,7 @@ void SoftAttachmentModel::updateClusterMatrices() {
 
     // post the blender if we're not currently waiting for one to finish
     auto modelBlender = DependencyManager::get<ModelBlender>();
-    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && geometry.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
+    if (_blendshapeOffsetsInitialized && modelBlender->shouldComputeBlendshapes() && hfmModel.hasBlendedMeshes() && _blendshapeCoefficients != _blendedBlendshapeCoefficients) {
         _blendedBlendshapeCoefficients = _blendshapeCoefficients;
         modelBlender->noteRequiresBlend(getThisPointer());
     }
diff --git a/tests-manual/gpu/src/TestFbx.cpp b/tests-manual/gpu/src/TestFbx.cpp
index 9890e4fbe7..9253f8bc91 100644
--- a/tests-manual/gpu/src/TestFbx.cpp
+++ b/tests-manual/gpu/src/TestFbx.cpp
@@ -100,12 +100,12 @@ bool TestFbx::isReady() const {
 
 void TestFbx::parseFbx(const QByteArray& fbxData) {
     QVariantHash mapping;
-    HFMGeometry* geometry = readFBX(fbxData, mapping);
+    HFMModel* hfmModel = readFBX(fbxData, mapping);
     size_t totalVertexCount = 0;
     size_t totalIndexCount = 0;
     size_t totalPartCount = 0;
     size_t highestIndex = 0;
-    for (const auto& mesh : geometry->meshes) {
+    for (const auto& mesh : hfmModel->meshes) {
         size_t vertexCount = mesh.vertices.size();
         totalVertexCount += mesh.vertices.size();
         highestIndex = std::max(highestIndex, vertexCount);
@@ -123,7 +123,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     std::vector<DrawElementsIndirectCommand> parts;
     parts.reserve(totalPartCount);
     _partCount = totalPartCount;
-    for (const auto& mesh : geometry->meshes) {
+    for (const auto& mesh : hfmModel->meshes) {
         baseVertex = vertices.size();
 
         vec3 color;
@@ -133,7 +133,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
             partIndirect.firstIndex = (uint)indices.size();
             partIndirect.baseInstance = (uint)parts.size();
             _partTransforms.push_back(mesh.modelTransform);
-            auto material = geometry->materials[part.materialID];
+            auto material = hfmModel->materials[part.materialID];
             color = material.diffuseColor;
             for (auto index : part.quadTrianglesIndices) {
                 indices.push_back(index);
@@ -163,7 +163,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     _vertexBuffer->append(vertices);
     _indexBuffer->append(indices);
     _indirectBuffer->append(parts);
-    delete geometry;
+    delete hfmModel;
 }
 
 void TestFbx::renderTest(size_t testId, RenderArgs* args) {
diff --git a/tests-manual/gpu/src/TestFbx.h b/tests-manual/gpu/src/TestFbx.h
index 4e22928460..8056af21ec 100644
--- a/tests-manual/gpu/src/TestFbx.h
+++ b/tests-manual/gpu/src/TestFbx.h
@@ -11,7 +11,7 @@
 
 #include <render/ShapePipeline.h>
 
-class HFMGeometry;
+class HFMModel;
 
 class TestFbx : public GpuTestBase {
     size_t _partCount { 0 };
diff --git a/tests/animation/src/AnimInverseKinematicsTests.cpp b/tests/animation/src/AnimInverseKinematicsTests.cpp
index f51fe12ecb..910770bb0d 100644
--- a/tests/animation/src/AnimInverseKinematicsTests.cpp
+++ b/tests/animation/src/AnimInverseKinematicsTests.cpp
@@ -28,7 +28,7 @@ const glm::quat identity = glm::quat();
 const glm::quat quaterTurnAroundZ = glm::angleAxis(0.5f * PI, zAxis);
 
 
-void makeTestFBXJoints(HFMGeometry& geometry) {
+void makeTestFBXJoints(HFMModel& hfmModel) {
     HFMJoint joint;
     joint.isFree = false;
     joint.freeLineage.clear();
@@ -60,29 +60,29 @@ void makeTestFBXJoints(HFMGeometry& geometry) {
     joint.name = "A";
     joint.parentIndex = -1;
     joint.translation = origin;
-    geometry.joints.push_back(joint);
+    hfmModel.joints.push_back(joint);
 
     joint.name = "B";
     joint.parentIndex = 0;
     joint.translation = xAxis;
-    geometry.joints.push_back(joint);
+    hfmModel.joints.push_back(joint);
 
     joint.name = "C";
     joint.parentIndex = 1;
     joint.translation = xAxis;
-    geometry.joints.push_back(joint);
+    hfmModel.joints.push_back(joint);
 
     joint.name = "D";
     joint.parentIndex = 2;
     joint.translation = xAxis;
-    geometry.joints.push_back(joint);
+    hfmModel.joints.push_back(joint);
 
     // compute each joint's transform
-    for (int i = 1; i < (int)geometry.joints.size(); ++i) {
-        HFMJoint& j = geometry.joints[i];
+    for (int i = 1; i < (int)hfmModel.joints.size(); ++i) {
+        HFMJoint& j = hfmModel.joints[i];
         int parentIndex = j.parentIndex;
         // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
-        j.transform = geometry.joints[parentIndex].transform *
+        j.transform = hfmModel.joints[parentIndex].transform *
             glm::translate(j.translation) *
             j.preTransform *
             glm::mat4_cast(j.preRotation * j.rotation * j.postRotation) *
@@ -96,12 +96,12 @@ void AnimInverseKinematicsTests::testSingleChain() {
 
     AnimContext context(false, false, false, glm::mat4(), glm::mat4());
 
-    HFMGeometry geometry;
-    makeTestFBXJoints(geometry);
+    HFMModel hfmModel;
+    makeTestFBXJoints(hfmModel);
 
     // create a skeleton and doll
     AnimPose offset;
-    AnimSkeleton::Pointer skeletonPtr = std::make_shared<AnimSkeleton>(geometry);
+    AnimSkeleton::Pointer skeletonPtr = std::make_shared<AnimSkeleton>(hfmModel);
     AnimInverseKinematics ikDoll("doll");
 
     ikDoll.setSkeleton(skeletonPtr);
@@ -119,7 +119,7 @@ void AnimInverseKinematicsTests::testSingleChain() {
         poses.push_back(pose);
 
         pose.trans() = xAxis;
-        for (int i = 1; i < (int)geometry.joints.size(); ++i) {
+        for (int i = 1; i < (int)hfmModel.joints.size(); ++i) {
             poses.push_back(pose);
         }
         ikDoll.loadPoses(poses);
diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.cpp b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
index 5107931da1..10b13aef36 100644
--- a/tools/skeleton-dump/src/SkeletonDumpApp.cpp
+++ b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
@@ -54,7 +54,7 @@ SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc
         return;
     }
     QByteArray blob = file.readAll();
-    std::unique_ptr<HFMGeometry> geometry(readFBX(blob, QVariantHash()));
+    std::unique_ptr<HFMModel> geometry(readFBX(blob, QVariantHash()));
     std::unique_ptr<AnimSkeleton> skeleton(new AnimSkeleton(*geometry));
     skeleton->dump(verbose);
 }
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index bb2958e11d..b5367a77ca 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -19,16 +19,16 @@
 
 // FBXReader jumbles the order of the meshes by reading them back out of a hashtable.  This will put
 // them back in the order in which they appeared in the file.
-bool HFMGeometryLessThan(const HFMMesh& e1, const HFMMesh& e2) {
+bool HFMModelLessThan(const HFMMesh& e1, const HFMMesh& e2) {
     return e1.meshIndex < e2.meshIndex;
 }
-void reSortHFMGeometryMeshes(HFMGeometry& geometry) {
-    qSort(geometry.meshes.begin(), geometry.meshes.end(), HFMGeometryLessThan);
+void reSortHFMModelMeshes(HFMModel& model) {
+    qSort(model.meshes.begin(), model.meshes.end(), HFMModelLessThan);
 }
 
 
 // Read all the meshes from provided FBX file
-bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMGeometry& result) {
+bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMModel& result) {
     if (_verbose) {
         qDebug() << "reading FBX file =" << filename << "...";
     }
@@ -41,19 +41,19 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMGeometry& result) {
     }
     try {
         QByteArray fbxContents = fbx.readAll();
-        HFMGeometry::Pointer geom;
+        HFMModel::Pointer model;
         if (filename.toLower().endsWith(".obj")) {
             bool combineParts = false;
-            geom = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
+            model = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
         } else if (filename.toLower().endsWith(".fbx")) {
-            geom.reset(readFBX(fbxContents, QVariantHash(), filename));
+            model.reset(readFBX(fbxContents, QVariantHash(), filename));
         } else {
             qWarning() << "file has unknown extension" << filename;
             return false;
         }
-        result = *geom;
+        result = *model;
 
-        reSortHFMGeometryMeshes(result);
+        reSortHFMModelMeshes(result);
     } catch (const QString& error) {
         qWarning() << "error reading" << filename << ":" << error;
         return false;
@@ -88,7 +88,7 @@ void getTrianglesInMeshPart(const HFMMeshPart &meshPart, std::vector<int>& trian
     }
 }
 
-void vhacd::VHACDUtil::fattenMesh(const HFMMesh& mesh, const glm::mat4& geometryOffset, HFMMesh& result) const {
+void vhacd::VHACDUtil::fattenMesh(const HFMMesh& mesh, const glm::mat4& modelOffset, HFMMesh& result) const {
     // this is used to make meshes generated from a highfield collidable.  each triangle
     // is converted into a tetrahedron and made into its own mesh-part.
 
@@ -104,7 +104,7 @@ void vhacd::VHACDUtil::fattenMesh(const HFMMesh& mesh, const glm::mat4& geometry
     int indexStartOffset = result.vertices.size();
 
     // new mesh gets the transformed points from the original
-    glm::mat4 totalTransform = geometryOffset * mesh.modelTransform;
+    glm::mat4 totalTransform = modelOffset * mesh.modelTransform;
     for (int i = 0; i < mesh.vertices.size(); i++) {
         // apply the source mesh's transform to the points
         glm::vec4 v = totalTransform * glm::vec4(mesh.vertices[i], 1.0f);
@@ -288,17 +288,17 @@ float computeDt(uint64_t start) {
     return (float)(usecTimestampNow() - start) / (float)USECS_PER_SECOND;
 }
 
-bool vhacd::VHACDUtil::computeVHACD(HFMGeometry& geometry,
+bool vhacd::VHACDUtil::computeVHACD(HFMModel& model,
                                     VHACD::IVHACD::Parameters params,
-                                    HFMGeometry& result,
+                                    HFMModel& result,
                                     float minimumMeshSize, float maximumMeshSize) {
     if (_verbose) {
-        qDebug() << "meshes =" << geometry.meshes.size();
+        qDebug() << "meshes =" << model.meshes.size();
     }
 
     // count the mesh-parts
     int numParts = 0;
-    foreach (const HFMMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, model.meshes) {
         numParts += mesh.parts.size();
     }
     if (_verbose) {
@@ -316,7 +316,7 @@ bool vhacd::VHACDUtil::computeVHACD(HFMGeometry& geometry,
 
     int meshIndex = 0;
     int validPartsFound = 0;
-    foreach (const HFMMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, model.meshes) {
 
         // find duplicate points
         int numDupes = 0;
@@ -337,7 +337,7 @@ bool vhacd::VHACDUtil::computeVHACD(HFMGeometry& geometry,
 
         // each mesh has its own transform to move it to model-space
         std::vector<glm::vec3> vertices;
-        glm::mat4 totalTransform = geometry.offset * mesh.modelTransform;
+        glm::mat4 totalTransform = model.offset * mesh.modelTransform;
         foreach (glm::vec3 vertex, mesh.vertices) {
             vertices.push_back(glm::vec3(totalTransform * glm::vec4(vertex, 1.0f)));
         }
diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h
index 64e86ed7df..6ef568d170 100644
--- a/tools/vhacd-util/src/VHACDUtil.h
+++ b/tools/vhacd-util/src/VHACDUtil.h
@@ -27,13 +27,13 @@ namespace vhacd {
     public:
         void setVerbose(bool verbose) { _verbose = verbose; }
 
-        bool loadFBX(const QString filename, HFMGeometry& result);
+        bool loadFBX(const QString filename, HFMModel& result);
 
-        void fattenMesh(const HFMMesh& mesh, const glm::mat4& gometryOffset, HFMMesh& result) const;
+        void fattenMesh(const HFMMesh& mesh, const glm::mat4& modelOffset, HFMMesh& result) const;
 
-        bool computeVHACD(HFMGeometry& geometry,
+        bool computeVHACD(HFMModel& model,
                           VHACD::IVHACD::Parameters params,
-                          HFMGeometry& result,
+                          HFMModel& result,
                           float minimumMeshSize, float maximumMeshSize);
 
         void getConvexResults(VHACD::IVHACD* convexifier, HFMMesh& resultMesh) const;
diff --git a/tools/vhacd-util/src/VHACDUtilApp.cpp b/tools/vhacd-util/src/VHACDUtilApp.cpp
index 0941198234..3d675f8baf 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.cpp
+++ b/tools/vhacd-util/src/VHACDUtilApp.cpp
@@ -36,7 +36,7 @@ QString formatFloat(double n) {
 }
 
 
-bool VHACDUtilApp::writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart) {
+bool VHACDUtilApp::writeOBJ(QString outFileName, HFMModel& hfmModel, bool outputCentimeters, int whichMeshPart) {
     QFile file(outFileName);
     if (!file.open(QIODevice::WriteOnly)) {
         qWarning() << "unable to write to" << outFileName;
@@ -56,7 +56,7 @@ bool VHACDUtilApp::writeOBJ(QString outFileName, HFMGeometry& geometry, bool out
 
     int vertexIndexOffset = 0;
 
-    foreach (const HFMMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, hfmModel.meshes) {
         bool verticesHaveBeenOutput = false;
         foreach (const HFMMeshPart &meshPart, mesh.parts) {
             if (whichMeshPart >= 0 && nth != (unsigned int) whichMeshPart) {
@@ -297,7 +297,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     // load the mesh
-    HFMGeometry fbx;
+    HFMModel fbx;
     auto begin = std::chrono::high_resolution_clock::now();
     if (!vUtil.loadFBX(inputFilename, fbx)){
         _returnCode = VHACD_RETURN_CODE_FAILURE_TO_READ;
@@ -358,7 +358,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
         }
         begin = std::chrono::high_resolution_clock::now();
 
-        HFMGeometry result;
+        HFMModel result;
         bool success = vUtil.computeVHACD(fbx, params, result, minimumMeshSize, maximumMeshSize);
 
         end = std::chrono::high_resolution_clock::now();
@@ -398,7 +398,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     if (fattenFaces) {
-        HFMGeometry newFbx;
+        HFMModel newFbx;
         HFMMesh result;
 
         // count the mesh-parts
diff --git a/tools/vhacd-util/src/VHACDUtilApp.h b/tools/vhacd-util/src/VHACDUtilApp.h
index 3db49456a0..72e8cfb7e4 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.h
+++ b/tools/vhacd-util/src/VHACDUtilApp.h
@@ -28,7 +28,7 @@ public:
     VHACDUtilApp(int argc, char* argv[]);
     ~VHACDUtilApp();
 
-    bool writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart = -1);
+    bool writeOBJ(QString outFileName, HFMModel& model, bool outputCentimeters, int whichMeshPart = -1);
 
     int getReturnCode() const { return _returnCode; }
 

From 917fc4ad58c5fa368f2d429f86789f7445973827 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 1 Nov 2018 16:50:37 -0700
Subject: [PATCH 48/73] Update language

---
 .../resources/qml/hifi/commerce/common/CommerceLightbox.qml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 5ddfa98923..5901adc484 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -33,7 +33,7 @@ Rectangle {
     property string buttonLayout: "leftright";
 
     readonly property string securityPicBodyText: "When you see your Security Pic, your actions and data are securely making use of your " +
-        "Wallet's private keys.<br><br>You can change your Security Pic in your Wallet.";
+        "private keys.<br><br>You can change your Security Pic via Settings > Security...";
 
     id: root;
     visible: false;

From 2b50c40224dcc3da5e29e5f8f7c2c93220cdef26 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 2 Nov 2018 09:33:06 -0700
Subject: [PATCH 49/73] Minor changes found by Chang

---
 .../qml/hifi/commerce/checkout/Checkout.qml   | 10 ++--
 .../InspectionCertificate.qml                 | 53 ++++++++++---------
 scripts/system/marketplaces/marketplaces.js   |  2 +-
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 95b040eceb..db030d2fee 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -937,9 +937,9 @@ Rectangle {
             }
         }
 
-        // "Continue Shopping" button
+        // "Continue" button
         HifiControlsUit.Button {
-            id: continueShoppingButton;
+            id: continueButton;
             color: hifi.buttons.noneBorderlessGray;
             colorScheme: hifi.colorSchemes.light;
             anchors.bottom: parent.bottom;
@@ -947,9 +947,9 @@ Rectangle {
             anchors.right: parent.right;
             width: 193;
             height: 44;
-            text: "Continue Shopping";
+            text: "Continue";
             onClicked: {
-                sendToScript({method: 'checkout_continueShopping', itemId: itemId});
+                sendToScript({method: 'checkout_continue', itemId: itemId});
             }
         }
     }
@@ -1038,7 +1038,7 @@ Rectangle {
                 width: parent.width/2 - anchors.leftMargin*2;
                 text: "Back to Marketplace";
                 onClicked: {
-                    sendToScript({method: 'checkout_continueShopping', itemId: itemId});
+                    sendToScript({method: 'checkout_continue', itemId: itemId});
                 }
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index d24344b40a..734292d774 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -28,7 +28,7 @@ Rectangle {
     property string itemName: "--";
     property string itemOwner: "--";
     property string itemEdition: "--";
-    property string dateOfPurchase: "--";
+    property string dateAcquired: "--";
     property string itemCost: "--";
     property string certTitleTextColor: hifi.colors.darkGray;
     property string certTextColor: hifi.colors.white;
@@ -64,7 +64,7 @@ Rectangle {
                     root.itemName = "";
                     root.itemEdition = "";
                     root.itemOwner = "";
-                    root.dateOfPurchase = "";
+                    root.dateAcquired = "";
                     root.itemCost = "";
                     errorText.text = "Information about this certificate is currently unavailable. Please try again later.";
                 }
@@ -77,8 +77,9 @@ Rectangle {
                     // "\u2022" is the Unicode character 'BULLET' - it's what's used in password fields on the web, etc
                     root.itemOwner = root.isMyCert ? Account.username :
                     "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022";
-                    root.dateOfPurchase = root.isMyCert ? getFormattedDate(result.data.transfer_created_at * 1000) : "Undisclosed";
-                    root.itemCost = (root.isMyCert && result.data.cost !== undefined) ? result.data.cost : "Undisclosed";
+                    root.dateAcquired = root.isMyCert ? getFormattedDate(result.data.transfer_created_at * 1000) : "Undisclosed";
+                    root.itemCost = (root.isMyCert && result.data.cost !== undefined) ? 
+                        (parseInt(result.data.cost) > 0 ? result.data.cost : "Free") : "Undisclosed";
                 }
                 if (root.certInfoReplaceMode > 4) {
                     root.itemEdition = result.data.edition_number + "/" + (result.data.limited_run === -1 ? "\u221e" : result.data.limited_run);
@@ -86,7 +87,7 @@ Rectangle {
 
                 if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
                     if (root.isMyCert) {
-                        errorText.text = "This item is an uncertified copy of an item you purchased.";
+                        errorText.text = "This item is an uncertified copy of an item you acquired.";
                     } else {
                         errorText.text = "The person who placed this item doesn't own it.";
                     }
@@ -102,8 +103,8 @@ Rectangle {
                     showInMarketplaceButton.visible = false;
                     // "Edition" text previously set above in this function
                     // "Owner" text previously set above in this function
-                    // "Purchase Date" text previously set above in this function
-                    // "Purchase Price" text previously set above in this function
+                    // "Date Acquired" text previously set above in this function
+                    // "Original Price" text previously set above in this function
                     if (result.data.invalid_reason) {
                         errorText.text = result.data.invalid_reason;
                     }
@@ -117,8 +118,8 @@ Rectangle {
                     showInMarketplaceButton.visible = true;
                     // "Edition" text previously set above in this function
                     // "Owner" text previously set above in this function
-                    // "Purchase Date" text previously set above in this function
-                    // "Purchase Price" text previously set above in this function
+                    // "Date Acquired" text previously set above in this function
+                    // "Original Price" text previously set above in this function
                     errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
                     "this entity will be cleaned up by the domain.";
                 }
@@ -145,8 +146,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             // "Edition" text will be set in "onCertificateInfoResult()"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Purchase Date" text will be set in "onCertificateInfoResult()"
-            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            // "Date Acquired" text will be set in "onCertificateInfoResult()"
+            // "Original Price" text will be set in "onCertificateInfoResult()"
             errorText.text = "";
         } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
             root.useGoldCert = false;
@@ -160,7 +161,7 @@ Rectangle {
             root.itemName = "";
             root.itemEdition = "";
             root.itemOwner = "";
-            root.dateOfPurchase = "";
+            root.dateAcquired = "";
             root.itemCost = "";
             errorText.text = "Your request to inspect this item timed out. Please try again later.";
         } else if (root.certificateStatus === 3) { // CERTIFICATE_STATUS_STATIC_VERIFICATION_FAILED
@@ -175,8 +176,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             // "Edition" text will be set in "onCertificateInfoResult()"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Purchase Date" text will be set in "onCertificateInfoResult()"
-            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            // "Date Acquired" text will be set in "onCertificateInfoResult()"
+            // "Original Price" text will be set in "onCertificateInfoResult()"
             errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
         } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
             root.useGoldCert = false;
@@ -190,8 +191,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             root.itemEdition = "Uncertified Copy"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Purchase Date" text will be set in "onCertificateInfoResult()"
-            // "Purchase Price" text will be set in "onCertificateInfoResult()"
+            // "Date Acquired" text will be set in "onCertificateInfoResult()"
+            // "Original Price" text will be set in "onCertificateInfoResult()"
             // "Error Text" text will be set in "onCertificateInfoResult()"
         } else {
             console.log("Unknown certificate status received from ledger signal!");
@@ -485,8 +486,8 @@ Rectangle {
         }
 
         RalewayRegular {
-            id: dateOfPurchaseHeader;
-            text: "PURCHASE DATE";
+            id: dateAcquiredHeader;
+            text: "DATE ACQUIRED";
             // Text size
             size: 16;
             // Anchors
@@ -500,15 +501,15 @@ Rectangle {
             color: hifi.colors.darkGray;
         }
         AnonymousProRegular {
-            id: dateOfPurchase;
-            text: root.dateOfPurchase;
+            id: dateAcquired;
+            text: root.dateAcquired;
             // Text size
             size: 18;
             // Anchors
-            anchors.top: dateOfPurchaseHeader.bottom;
+            anchors.top: dateAcquiredHeader.bottom;
             anchors.topMargin: 8;
-            anchors.left: dateOfPurchaseHeader.left;
-            anchors.right: dateOfPurchaseHeader.right;
+            anchors.left: dateAcquiredHeader.left;
+            anchors.right: dateAcquiredHeader.right;
             height: paintedHeight;
             // Style
             color: root.infoTextColor;
@@ -516,7 +517,7 @@ Rectangle {
 
         RalewayRegular {
             id: priceHeader;
-            text: "PURCHASE PRICE";
+            text: "ORIGINAL PRICE";
             // Text size
             size: 16;
             // Anchors
@@ -530,7 +531,7 @@ Rectangle {
         }
         HiFiGlyphs {
             id: hfcGlyph;
-            visible: priceText.text !== "Undisclosed" && priceText.text !== "";
+            visible: priceText.text !== "Undisclosed" && priceText.text !== "" && priceText.text !== "Free";
             text: hifi.glyphs.hfc;
             // Size
             size: 24;
@@ -618,7 +619,7 @@ Rectangle {
         root.itemName = "--";
         root.itemOwner = "--";
         root.itemEdition = "--";
-        root.dateOfPurchase = "--";
+        root.dateAcquired = "--";
         root.marketplaceUrl = "";
         root.itemCost = "--";
         root.isMyCert = false;
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 9f55bade6a..01ab9b5639 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -554,7 +554,7 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     case 'checkout_itemLinkClicked':
         openMarketplace(message.itemId);
         break;
-    case 'checkout_continueShopping':
+    case 'checkout_continue':
         openMarketplace();
         break;
     case 'checkout_rezClicked':

From 402c23e359f0a9cc6f4a12e1cc54c10e90d9635e Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 2 Nov 2018 16:07:29 -0700
Subject: [PATCH 50/73] Use useragent instead of queryparam to determine
 limitedCommerce

---
 interface/src/Application.cpp                         | 3 ---
 interface/src/scripting/WalletScriptingInterface.cpp  | 9 ++++++++-
 interface/src/scripting/WalletScriptingInterface.h    | 3 +--
 interface/src/ui/overlays/ContextOverlayInterface.cpp | 7 +------
 libraries/ui/src/ui/types/RequestFilters.cpp          | 9 +++------
 scripts/system/avatarapp.js                           | 2 +-
 scripts/system/commerce/wallet.js                     | 3 +--
 scripts/system/edit.js                                | 2 +-
 scripts/system/html/js/marketplacesInject.js          | 6 +++---
 scripts/system/marketplaces/marketplace.js            | 2 +-
 scripts/system/marketplaces/marketplaces.js           | 5 +----
 11 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 70c25ce823..ff1822013b 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -7881,9 +7881,6 @@ void Application::loadAvatarBrowser() const {
     auto tablet = dynamic_cast<TabletProxy*>(DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system"));
     // construct the url to the marketplace item
     QString url = NetworkingConstants::METAVERSE_SERVER_URL().toString() + "/marketplace?category=avatars";
-    if (DependencyManager::get<WalletScriptingInterface>()->getLimitedCommerce()) {
-        url += "&isFree=1";
-    }
 
     QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js";
     tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
diff --git a/interface/src/scripting/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
index 77ca232712..386cb4cba6 100644
--- a/interface/src/scripting/WalletScriptingInterface.cpp
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -10,6 +10,7 @@
 //
 
 #include "WalletScriptingInterface.h"
+#include <SettingHandle.h>
 
 CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(qmlObject, parent) {
     Q_ASSERT(QThread::currentThread() == qApp->thread());
@@ -38,4 +39,10 @@ void WalletScriptingInterface::proveAvatarEntityOwnershipVerification(const QUui
     } else {
         qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is not an avatar entity";
     }
-}
\ No newline at end of file
+}
+
+void WalletScriptingInterface::setLimitedCommerce(bool isLimited) {
+    _limitedCommerce = isLimited;
+    Setting::Handle<bool> limitedCommerceSetting{ "limitedCommerce", false };
+    limitedCommerceSetting.set(_limitedCommerce);
+}
diff --git a/interface/src/scripting/WalletScriptingInterface.h b/interface/src/scripting/WalletScriptingInterface.h
index 8aebb68a47..950fc9262a 100644
--- a/interface/src/scripting/WalletScriptingInterface.h
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -15,7 +15,6 @@
 #include <QtCore/QObject>
 #include <DependencyManager.h>
 
-#include "scripting/HMDScriptingInterface.h"
 #include <ui/TabletScriptingInterface.h>
 #include <ui/QmlWrapper.h>
 #include <OffscreenUi.h>
@@ -68,7 +67,7 @@ public:
     void setWalletStatus(const uint& status);
 
     bool getLimitedCommerce() { return _limitedCommerce; }
-    void setLimitedCommerce(bool isLimited) { _limitedCommerce = isLimited; }
+    void setLimitedCommerce(bool isLimited);
 
 signals:
 
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index 9f1018f6c7..11c268dd48 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -223,12 +223,7 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
 
 bool ContextOverlayInterface::contextOverlayFilterPassed(const EntityItemID& entityItemID) {
     EntityItemProperties entityProperties = _entityScriptingInterface->getEntityProperties(entityItemID, _entityPropertyFlags);
-    Setting::Handle<bool> _settingSwitch{ "commerce", true };
-    if (_settingSwitch.get()) {
-        return (entityProperties.getCertificateID().length() != 0);
-    } else {
-        return (entityProperties.getMarketplaceID().length() != 0);
-    }
+    return (entityProperties.getCertificateID().length() != 0);
 }
 
 bool ContextOverlayInterface::destroyContextOverlay(const EntityItemID& entityItemID, const PointerEvent& event) {
diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp
index 7f192d6e52..0e08874251 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -84,13 +84,10 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info,
     static const QString USER_AGENT = "User-Agent";
     const QString tokenStringMobile{ "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36" };
     const QString tokenStringMetaverse{ "Chrome/48.0 (HighFidelityInterface)" };
+    const QString tokenStringLimitedCommerce{ "Chrome/48.0 (HighFidelityInterface limitedCommerce)" };
+    Setting::Handle<bool> limitedCommerceSetting{ "limitedCommerce", false };
 
-    // During the period in which we have HFC commerce in the system, but not applied everywhere:
-    const QString tokenStringCommerce{ "Chrome/48.0 (HighFidelityInterface WithHFC)" };
-    Setting::Handle<bool> _settingSwitch{ "commerce", true };
-    bool isMoney = _settingSwitch.get();
-
-    const QString tokenString = !isAuthable ? tokenStringMobile : (isMoney ? tokenStringCommerce : tokenStringMetaverse);
+    const QString tokenString = !isAuthable ? tokenStringMobile : (limitedCommerceSetting.get() ? tokenStringLimitedCommerce : tokenStringMetaverse);
     info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
 }
 
diff --git a/scripts/system/avatarapp.js b/scripts/system/avatarapp.js
index 2f05b1b337..44f10396ca 100644
--- a/scripts/system/avatarapp.js
+++ b/scripts/system/avatarapp.js
@@ -160,7 +160,7 @@ var selectedAvatarEntityID = null;
 var grabbedAvatarEntityChangeNotifier = null;
 
 var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/wallet/Wallet.qml";
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("html/js/marketplacesInject.js");
 
 function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml.
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index bc7bccd94f..fd230de0e4 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -18,8 +18,7 @@ Script.include("/~/system/libraries/accountUtils.js");
 Script.include("/~/system/libraries/connectionUtils.js");
 var AppUi = Script.require('appUi');
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" +
-    (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+    var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";;
 
 // BEGIN AVATAR SELECTOR LOGIC
 var UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6 };
diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index ee1f5ecbec..6425806771 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -193,7 +193,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", {
     visible: false
 });
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 var marketplaceWindow = new OverlayWebWindow({
     title: 'Marketplace',
     source: "about:blank",
diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index db433c5058..5cae42e33e 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -60,7 +60,7 @@
         );
 
         // Footer.
-        var isInitialHiFiPage = location.href === (marketplaceBaseURL + "/marketplace" + (limitedCommerce ? "?isFree=1" : "?"));
+        var isInitialHiFiPage = location.href === (marketplaceBaseURL + "/marketplace?");
         $("body").append(
             '<div id="marketplace-navigation">' +
                 (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
@@ -72,7 +72,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?") + (limitedCommerce ? "isFree=1" : "");
+            (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?");
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(JSON.stringify({
@@ -93,7 +93,7 @@
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
         $('#exploreHifiMarketplace').on('click', function () {
-            window.location = marketplaceBaseURL + "/marketplace" + (limitedCommerce ? "?isFree=1" : "?");
+            window.location = marketplaceBaseURL + "/marketplace?";
         });
     }
 
diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js
index 2f749656d3..d90695c767 100644
--- a/scripts/system/marketplaces/marketplace.js
+++ b/scripts/system/marketplaces/marketplace.js
@@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js");
 
 var toolIconUrl = Script.resolvePath("../assets/images/tools/");
 
-var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 var marketplaceWindow = new OverlayWebWindow({
     title: "Marketplace",
     source: "about:blank",
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index 01ab9b5639..ed8ed9f288 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -165,9 +165,6 @@ function openMarketplace(optionalItemOrUrl) {
     if (optionalItemOrUrl && optionalItemOrUrl.indexOf(METAVERSE_SERVER_URL) === -1) {
         url = MARKETPLACE_URL + '/items/' + optionalItemOrUrl;
     }
-    if (WalletScriptingInterface.limitedCommerce) {
-        url += "?isFree=1";
-    }
     ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
 }
 
@@ -748,7 +745,7 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
 
 
 var BUTTON_NAME = "MARKET";
-var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace" + (WalletScriptingInterface.limitedCommerce ? "?isFree=1" : "");
+var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace";
 // Append "?" if necessary to signal injected script that it's the initial page.
 var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + (MARKETPLACE_URL.indexOf("?") > -1 ? "" : "?");
 var ui;

From d0854ca2ab1219977068a55bb83558a1b0ed546c Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Fri, 2 Nov 2018 16:42:18 -0700
Subject: [PATCH 51/73] Use AccountManager instead of settings

---
 interface/src/scripting/WalletScriptingInterface.cpp | 11 +++++------
 interface/src/scripting/WalletScriptingInterface.h   |  8 +++++---
 libraries/networking/src/AccountManager.cpp          |  4 ++++
 libraries/networking/src/AccountManager.h            |  6 ++++++
 libraries/ui/src/ui/types/RequestFilters.cpp         |  5 ++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/interface/src/scripting/WalletScriptingInterface.cpp b/interface/src/scripting/WalletScriptingInterface.cpp
index 386cb4cba6..93ee60ba5b 100644
--- a/interface/src/scripting/WalletScriptingInterface.cpp
+++ b/interface/src/scripting/WalletScriptingInterface.cpp
@@ -16,6 +16,11 @@ CheckoutProxy::CheckoutProxy(QObject* qmlObject, QObject* parent) : QmlWrapper(q
     Q_ASSERT(QThread::currentThread() == qApp->thread());
 }
 
+WalletScriptingInterface::WalletScriptingInterface() {
+    connect(DependencyManager::get<AccountManager>().data(),
+        &AccountManager::limitedCommerceChanged, this, &WalletScriptingInterface::limitedCommerceChanged);
+}
+
 void WalletScriptingInterface::refreshWalletStatus() {
     auto wallet = DependencyManager::get<Wallet>();
     wallet->getWalletStatus();
@@ -40,9 +45,3 @@ void WalletScriptingInterface::proveAvatarEntityOwnershipVerification(const QUui
         qCDebug(entities) << "Failed to prove ownership of:" << entityID << "is not an avatar entity";
     }
 }
-
-void WalletScriptingInterface::setLimitedCommerce(bool isLimited) {
-    _limitedCommerce = isLimited;
-    Setting::Handle<bool> limitedCommerceSetting{ "limitedCommerce", false };
-    limitedCommerceSetting.set(_limitedCommerce);
-}
diff --git a/interface/src/scripting/WalletScriptingInterface.h b/interface/src/scripting/WalletScriptingInterface.h
index 950fc9262a..36ee021b29 100644
--- a/interface/src/scripting/WalletScriptingInterface.h
+++ b/interface/src/scripting/WalletScriptingInterface.h
@@ -21,6 +21,7 @@
 #include "Application.h"
 #include "commerce/Wallet.h"
 #include "ui/overlays/ContextOverlayInterface.h"
+#include <AccountManager.h>
 
 class CheckoutProxy : public QmlWrapper {
     Q_OBJECT
@@ -45,6 +46,8 @@ class WalletScriptingInterface : public QObject, public Dependency {
 
 public:
 
+    WalletScriptingInterface();
+
     /**jsdoc
      * @function WalletScriptingInterface.refreshWalletStatus
      */
@@ -66,8 +69,8 @@ public:
     //     scripts could cause the Wallet to incorrectly report its status.
     void setWalletStatus(const uint& status);
 
-    bool getLimitedCommerce() { return _limitedCommerce; }
-    void setLimitedCommerce(bool isLimited);
+    bool getLimitedCommerce() { return DependencyManager::get<AccountManager>()->getLimitedCommerce(); }
+    void setLimitedCommerce(bool isLimited) { DependencyManager::get<AccountManager>()->setLimitedCommerce(isLimited); };
 
 signals:
 
@@ -105,7 +108,6 @@ signals:
 
 private:
     uint _walletStatus;
-    bool _limitedCommerce = false;
 };
 
 #endif // hifi_WalletScriptingInterface_h
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index d99c0020da..2d1a0c0afb 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -837,3 +837,7 @@ void AccountManager::handleKeypairGenerationError() {
     // reset our waiting state for keypair response
     _isWaitingForKeypairResponse = false;
 }
+
+void AccountManager::setLimitedCommerce(bool isLimited) {
+    _limitedCommerce = isLimited;
+}
diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h
index f3b81cf1c9..093ac9a27c 100644
--- a/libraries/networking/src/AccountManager.h
+++ b/libraries/networking/src/AccountManager.h
@@ -98,6 +98,9 @@ public:
 
     void removeAccountFromFile();
 
+    bool getLimitedCommerce() { return _limitedCommerce; }
+    void setLimitedCommerce(bool isLimited);
+
 public slots:
     void requestAccessToken(const QString& login, const QString& password);
     void requestAccessTokenWithSteam(QByteArray authSessionTicket);
@@ -121,6 +124,7 @@ signals:
     void loginFailed();
     void logoutComplete();
     void newKeypair();
+    void limitedCommerceChanged();
 
 private slots:
     void handleKeypairGenerationError();
@@ -150,6 +154,8 @@ private:
     QByteArray _pendingPrivateKey;
 
     QUuid _sessionID { QUuid::createUuid() };
+
+    bool _limitedCommerce { false };
 };
 
 #endif // hifi_AccountManager_h
diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp
index 0e08874251..a3b3b7dc57 100644
--- a/libraries/ui/src/ui/types/RequestFilters.cpp
+++ b/libraries/ui/src/ui/types/RequestFilters.cpp
@@ -70,9 +70,9 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info,
 
     // check if this is a request to a highfidelity URL
     bool isAuthable = isAuthableHighFidelityURL(info.requestUrl());
+    auto accountManager = DependencyManager::get<AccountManager>();
     if (isAuthable) {
         // if we have an access token, add it to the right HTTP header for authorization
-        auto accountManager = DependencyManager::get<AccountManager>();
 
         if (accountManager->hasValidAccessToken()) {
             static const QString OAUTH_AUTHORIZATION_HEADER = "Authorization";
@@ -85,9 +85,8 @@ void RequestFilters::interceptHFWebEngineRequest(QWebEngineUrlRequestInfo& info,
     const QString tokenStringMobile{ "Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Mobile Safari/537.36" };
     const QString tokenStringMetaverse{ "Chrome/48.0 (HighFidelityInterface)" };
     const QString tokenStringLimitedCommerce{ "Chrome/48.0 (HighFidelityInterface limitedCommerce)" };
-    Setting::Handle<bool> limitedCommerceSetting{ "limitedCommerce", false };
 
-    const QString tokenString = !isAuthable ? tokenStringMobile : (limitedCommerceSetting.get() ? tokenStringLimitedCommerce : tokenStringMetaverse);
+    const QString tokenString = !isAuthable ? tokenStringMobile : (accountManager->getLimitedCommerce() ? tokenStringLimitedCommerce : tokenStringMetaverse);
     info.setHttpHeader(USER_AGENT.toLocal8Bit(), tokenString.toLocal8Bit());
 }
 

From ae51b95ca13f9d3f66a28f565d42c903dfc69276 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 4 Nov 2018 11:15:46 -0800
Subject: [PATCH 52/73] fix bad tab reference

---
 interface/resources/qml/hifi/commerce/wallet/Wallet.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index d882ef8d38..97736bf781 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -630,7 +630,7 @@ Rectangle {
             visible: !walletSetup.visible;
             color: root.activeView === "help" ? hifi.colors.blueAccent : hifi.colors.black;
             anchors.top: parent.top;
-            anchors.left: securityButtonContainer.right;
+            anchors.left: sendMoneyButtonContainer.right;
             anchors.bottom: parent.bottom;
             width: parent.width / tabButtonsContainer.numTabs;
         

From 8ad8398ef3d04f6f9b9f200f53227ea4cb3491d6 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 4 Nov 2018 11:17:56 -0800
Subject: [PATCH 53/73] remove 'purchase' from login notice.

---
 scripts/system/html/js/marketplacesInject.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 5cae42e33e..c4a4adebdf 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -170,7 +170,7 @@
 
             var span = document.createElement('span');
             span.style = "margin:10px;color:#1b6420;font-size:15px;";
-            span.innerHTML = "to purchase items from the Marketplace.";
+            span.innerHTML = "to get items from the Marketplace.";
 
             var xButton = document.createElement('a');
             xButton.id = "xButton";

From 100a17a2b9ee8293ca10a30747970ecfc096c1f1 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 4 Nov 2018 11:25:40 -0800
Subject: [PATCH 54/73] remove wallet reference in update notification

---
 scripts/system/commerce/wallet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 641112b6b4..1fbf952dc6 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -582,7 +582,7 @@ function notificationPollCallbackUpdates(updatesArray) {
         if (!ui.notificationInitialCallbackMade[0]) {
             message = updatesArray.length + " of your purchased items " +
                 (updatesArray.length === 1 ? "has an update " : "have updates ") +
-                "available. Open WALLET to update.";
+                "available. Open ASSETS to update.";
             ui.notificationDisplayBanner(message);
 
             ui.notificationPollCaresAboutSince[0] = true;
@@ -590,7 +590,7 @@ function notificationPollCallbackUpdates(updatesArray) {
             for (var i = 0; i < updatesArray.length; i++) {
                 message = "Update available for \"" +
                     updatesArray[i].base_item_title + "\"." +
-                    "Open WALLET to update.";
+                    "Open ASSETS to update.";
                 ui.notificationDisplayBanner(message);
             }
         }

From 8906b909eb715fba8e20b1f941a5e9c4f2a7cee6 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 4 Nov 2018 12:08:29 -0800
Subject: [PATCH 55/73] close wallet app during login so that it doesn't tell
 to login after login

---
 scripts/system/commerce/wallet.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 1fbf952dc6..837cf6a78a 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -437,6 +437,7 @@ function fromQml(message) {
         }
         break;
     case 'needsLogIn_loginClicked':
+        ui.close();
         openLoginWindow();
         break;
     case 'disableHmdPreview':

From 7115f0e6886783e9aab0d4342695c858218cacdc Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Sun, 4 Nov 2018 12:17:41 -0800
Subject: [PATCH 56/73] update notification refs inventory, not assets

---
 scripts/system/commerce/wallet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 8b6fdbd1b1..4fb7ddd40b 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -583,7 +583,7 @@ function notificationPollCallbackUpdates(updatesArray) {
         if (!ui.notificationInitialCallbackMade[0]) {
             message = updatesArray.length + " of your purchased items " +
                 (updatesArray.length === 1 ? "has an update " : "have updates ") +
-                "available. Open ASSETS to update.";
+                "available. Open INVENTORY to update.";
             ui.notificationDisplayBanner(message);
 
             ui.notificationPollCaresAboutSince[0] = true;
@@ -591,7 +591,7 @@ function notificationPollCallbackUpdates(updatesArray) {
             for (var i = 0; i < updatesArray.length; i++) {
                 message = "Update available for \"" +
                     updatesArray[i].base_item_title + "\"." +
-                    "Open ASSETS to update.";
+                    "Open INVENTORY to update.";
                 ui.notificationDisplayBanner(message);
             }
         }

From 30eb360f626c0b3e91fb5fd5c22e708c4093bc80 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Mon, 5 Nov 2018 12:07:17 -0800
Subject: [PATCH 57/73] Convert remaining HFMModels called model to hfmModel,
 and rename some missed local variables

---
 interface/src/ModelPackager.cpp               |  34 ++---
 interface/src/ModelPackager.h                 |   4 +-
 interface/src/ModelPropertiesDialog.cpp       |  20 +--
 interface/src/ModelPropertiesDialog.h         |   4 +-
 libraries/animation/src/AnimClip.cpp          |  10 +-
 libraries/animation/src/AnimSkeleton.cpp      |   6 +-
 libraries/animation/src/AnimSkeleton.h        |   2 +-
 .../src/avatars-renderer/SkeletonModel.cpp    |   6 +-
 libraries/baking/src/FBXBaker.cpp             |   6 +-
 libraries/baking/src/FBXBaker.h               |   2 +-
 libraries/baking/src/OBJBaker.cpp             |  20 +--
 libraries/baking/src/OBJBaker.h               |   4 +-
 libraries/fbx/src/FBXReader.cpp               | 138 +++++++++---------
 libraries/fbx/src/GLTFReader.cpp              |  42 +++---
 libraries/fbx/src/GLTFReader.h                |   4 +-
 libraries/fbx/src/OBJReader.cpp               |  46 +++---
 libraries/fbx/src/OBJReader.h                 |   2 +-
 tools/vhacd-util/src/VHACDUtil.cpp            |  22 +--
 tools/vhacd-util/src/VHACDUtil.h              |   2 +-
 tools/vhacd-util/src/VHACDUtilApp.h           |   2 +-
 20 files changed, 188 insertions(+), 188 deletions(-)

diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index f3a69bbad2..21d3477d7e 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -109,10 +109,10 @@ bool ModelPackager::loadModel() {
         qCDebug(interfaceapp) << "Reading FBX file : " << _fbxInfo.filePath();
         QByteArray fbxContents = fbx.readAll();
 
-        _model.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));
+        _hfmModel.reset(readFBX(fbxContents, QVariantHash(), _fbxInfo.filePath()));
 
         // make sure we have some basic mappings
-        populateBasicMapping(_mapping, _fbxInfo.filePath(), *_model);
+        populateBasicMapping(_mapping, _fbxInfo.filePath(), *_hfmModel);
     } catch (const QString& error) {
         qCDebug(interfaceapp) << "Error reading " << _fbxInfo.filePath() << ": " << error;
         return false;
@@ -122,7 +122,7 @@ bool ModelPackager::loadModel() {
 
 bool ModelPackager::editProperties() {
     // open the dialog to configure the rest
-    ModelPropertiesDialog properties(_modelType, _mapping, _modelFile.path(), *_model);
+    ModelPropertiesDialog properties(_modelType, _mapping, _modelFile.path(), *_hfmModel);
     if (properties.exec() == QDialog::Rejected) {
         return false;
     }
@@ -235,18 +235,18 @@ bool ModelPackager::zipModel() {
     return true;
 }
 
-void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& model) {
+void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& hfmModel) {
 
     bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
 
     // mixamo files - in the event that a mixamo file was edited by some other tool, it's likely the applicationName will
     // be rewritten, so we detect the existence of several different blendshapes which indicate we're likely a mixamo file
-    bool likelyMixamoFile = model.applicationName == "mixamo.com" ||
-                            (model.blendshapeChannelNames.contains("BrowsDown_Right") &&
-                             model.blendshapeChannelNames.contains("MouthOpen") &&
-                             model.blendshapeChannelNames.contains("Blink_Left") &&
-                             model.blendshapeChannelNames.contains("Blink_Right") &&
-                             model.blendshapeChannelNames.contains("Squint_Right"));
+    bool likelyMixamoFile = hfmModel.applicationName == "mixamo.com" ||
+                            (hfmModel.blendshapeChannelNames.contains("BrowsDown_Right") &&
+                             hfmModel.blendshapeChannelNames.contains("MouthOpen") &&
+                             hfmModel.blendshapeChannelNames.contains("Blink_Left") &&
+                             hfmModel.blendshapeChannelNames.contains("Blink_Right") &&
+                             hfmModel.blendshapeChannelNames.contains("Squint_Right"));
     
     if (!mapping.contains(NAME_FIELD)) {
         mapping.insert(NAME_FIELD, QFileInfo(filename).baseName());
@@ -268,15 +268,15 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
     }
     QVariantHash joints = mapping.value(JOINT_FIELD).toHash();
     if (!joints.contains("jointEyeLeft")) {
-        joints.insert("jointEyeLeft", model.jointIndices.contains("jointEyeLeft") ? "jointEyeLeft" :
-                      (model.jointIndices.contains("EyeLeft") ? "EyeLeft" : "LeftEye"));
+        joints.insert("jointEyeLeft", hfmModel.jointIndices.contains("jointEyeLeft") ? "jointEyeLeft" :
+                      (hfmModel.jointIndices.contains("EyeLeft") ? "EyeLeft" : "LeftEye"));
     }
     if (!joints.contains("jointEyeRight")) {
-        joints.insert("jointEyeRight", model.jointIndices.contains("jointEyeRight") ? "jointEyeRight" :
-                      model.jointIndices.contains("EyeRight") ? "EyeRight" : "RightEye");
+        joints.insert("jointEyeRight", hfmModel.jointIndices.contains("jointEyeRight") ? "jointEyeRight" :
+                      hfmModel.jointIndices.contains("EyeRight") ? "EyeRight" : "RightEye");
     }
     if (!joints.contains("jointNeck")) {
-        joints.insert("jointNeck", model.jointIndices.contains("jointNeck") ? "jointNeck" : "Neck");
+        joints.insert("jointNeck", hfmModel.jointIndices.contains("jointNeck") ? "jointNeck" : "Neck");
     }
     
     if (isBodyType) {
@@ -296,7 +296,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
     
     if (!joints.contains("jointHead")) {
         const char* topName = likelyMixamoFile ? "HeadTop_End" : "HeadEnd";
-        joints.insert("jointHead", model.jointIndices.contains(topName) ? topName : "Head");
+        joints.insert("jointHead", hfmModel.jointIndices.contains(topName) ? topName : "Head");
     }
 
     mapping.insert(JOINT_FIELD, joints);
@@ -370,7 +370,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
 
 void ModelPackager::listTextures() {
     _textures.clear();
-    foreach (const HFMMaterial mat, _model->materials) {
+    foreach (const HFMMaterial mat, _hfmModel->materials) {
         if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&
             !_textures.contains(mat.albedoTexture.filename)) {
             _textures << mat.albedoTexture.filename;
diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index 2ec629a363..ed86f15008 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -32,7 +32,7 @@ private:
     bool editProperties();
     bool zipModel();
     
-    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& model);
+    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMModel& hfmModel);
     
     void listTextures();
     bool copyTextures(const QString& oldDir, const QDir& newDir);
@@ -44,7 +44,7 @@ private:
     QString _scriptDir;
 
     QVariantHash _mapping;
-    std::unique_ptr<HFMModel> _model;
+    std::unique_ptr<HFMModel> _hfmModel;
     QStringList _textures;
     QStringList _scripts;
 };
diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index 0b1638a5bc..49c57744a9 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -27,11 +27,11 @@
 
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                                             const QString& basePath, const HFMModel& model) :
+                                             const QString& basePath, const HFMModel& hfmModel) :
 _modelType(modelType),
 _originalMapping(originalMapping),
 _basePath(basePath),
-_model(model)
+_hfmModel(hfmModel)
 {
     setWindowTitle("Set Model Properties");
 
@@ -108,8 +108,8 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
 
     // update the joint indices
     QVariantHash jointIndices;
-    for (int i = 0; i < _model.joints.size(); i++) {
-        jointIndices.insert(_model.joints.at(i).name, QString::number(i));
+    for (int i = 0; i < _hfmModel.joints.size(); i++) {
+        jointIndices.insert(_hfmModel.joints.at(i).name, QString::number(i));
     }
     mapping.insert(JOINT_INDEX_FIELD, jointIndices);
 
@@ -118,10 +118,10 @@ QVariantHash ModelPropertiesDialog::getMapping() const {
         if (_modelType == FSTReader::ATTACHMENT_MODEL) {
             glm::vec3 pivot;
             if (_pivotAboutCenter->isChecked()) {
-                pivot = (_model.meshExtents.minimum + _model.meshExtents.maximum) * 0.5f;
+                pivot = (_hfmModel.meshExtents.minimum + _hfmModel.meshExtents.maximum) * 0.5f;
 
             } else if (_pivotJoint->currentIndex() != 0) {
-                pivot = extractTranslation(_model.joints.at(_pivotJoint->currentIndex() - 1).transform);
+                pivot = extractTranslation(_hfmModel.joints.at(_pivotJoint->currentIndex() - 1).transform);
             }
             mapping.insert(TRANSLATION_X_FIELD, -pivot.x * (float)_scale->value() + (float)_translationX->value());
             mapping.insert(TRANSLATION_Y_FIELD, -pivot.y * (float)_scale->value() + (float)_translationY->value());
@@ -191,7 +191,7 @@ void ModelPropertiesDialog::reset() {
             }
             foreach (const QVariant& joint, _originalMapping.values(FREE_JOINT_FIELD)) {
                 QString jointName = joint.toString();
-                if (_model.jointIndices.contains(jointName)) {
+                if (_hfmModel.jointIndices.contains(jointName)) {
                     createNewFreeJoint(jointName);
                 }
             }
@@ -249,8 +249,8 @@ QComboBox* ModelPropertiesDialog::createJointBox(bool withNone) const {
     if (withNone) {
         box->addItem("(none)");
     }
-    foreach (const HFMJoint& joint, _model.joints) {
-        if (joint.isSkeletonJoint || !_model.hasSkeletonJoints) {
+    foreach (const HFMJoint& joint, _hfmModel.joints) {
+        if (joint.isSkeletonJoint || !_hfmModel.hasSkeletonJoints) {
             box->addItem(joint.name);
         }
     }
@@ -266,7 +266,7 @@ QDoubleSpinBox* ModelPropertiesDialog::createTranslationBox() const {
 }
 
 void ModelPropertiesDialog::insertJointMapping(QVariantHash& joints, const QString& joint, const QString& name) const {
-    if (_model.jointIndices.contains(name)) {
+    if (_hfmModel.jointIndices.contains(name)) {
         joints.insert(joint, name);
     } else {
         joints.remove(joint);
diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h
index b979768a2d..0bf8075197 100644
--- a/interface/src/ModelPropertiesDialog.h
+++ b/interface/src/ModelPropertiesDialog.h
@@ -30,7 +30,7 @@ class ModelPropertiesDialog : public QDialog {
     
 public:
     ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                          const QString& basePath, const HFMModel& model);
+                          const QString& basePath, const HFMModel& hfmModel);
     
     QVariantHash getMapping() const;
     
@@ -50,7 +50,7 @@ private:
     FSTReader::ModelType _modelType;
     QVariantHash _originalMapping;
     QString _basePath;
-    HFMModel _model;
+    HFMModel _hfmModel;
     QLineEdit* _name = nullptr;
     QPushButton* _textureDirectory = nullptr;
     QPushButton* _scriptDirectory = nullptr;
diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index 7380ca8a13..eeac8fadce 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -101,8 +101,8 @@ void AnimClip::copyFromNetworkAnim() {
 
     // build a mapping from animation joint indices to skeleton joint indices.
     // by matching joints with the same name.
-    const HFMModel& model = _networkAnim->getHFMModel();
-    AnimSkeleton animSkeleton(model);
+    const HFMModel& hfmModel = _networkAnim->getHFMModel();
+    AnimSkeleton animSkeleton(hfmModel);
     const auto animJointCount = animSkeleton.getNumJoints();
     const auto skeletonJointCount = _skeleton->getNumJoints();
     std::vector<int> jointMap;
@@ -115,12 +115,12 @@ void AnimClip::copyFromNetworkAnim() {
         jointMap.push_back(skeletonJoint);
     }
 
-    const int frameCount = model.animationFrames.size();
+    const int frameCount = hfmModel.animationFrames.size();
     _anim.resize(frameCount);
 
     for (int frame = 0; frame < frameCount; frame++) {
 
-        const HFMAnimationFrame& hfmAnimFrame = model.animationFrames[frame];
+        const HFMAnimationFrame& hfmAnimFrame = hfmModel.animationFrames[frame];
 
         // init all joints in animation to default pose
         // this will give us a resonable result for bones in the model skeleton but not in the animation.
@@ -150,7 +150,7 @@ void AnimClip::copyFromNetworkAnim() {
 
                 // adjust translation offsets, so large translation animatons on the reference skeleton
                 // will be adjusted when played on a skeleton with short limbs.
-                const glm::vec3& hfmZeroTrans = model.animationFrames[0].translations[animJoint];
+                const glm::vec3& hfmZeroTrans = hfmModel.animationFrames[0].translations[animJoint];
                 const AnimPose& relDefaultPose = _skeleton->getRelativeDefaultPose(skeletonJoint);
                 float boneLengthScale = 1.0f;
                 const float EPSILON = 0.0001f;
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index bc179739a0..73a0891fbe 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -16,11 +16,11 @@
 
 #include "AnimationLogging.h"
 
-AnimSkeleton::AnimSkeleton(const HFMModel& model) {
+AnimSkeleton::AnimSkeleton(const HFMModel& hfmModel) {
     // convert to std::vector of joints
     std::vector<HFMJoint> joints;
-    joints.reserve(model.joints.size());
-    for (auto& joint : model.joints) {
+    joints.reserve(hfmModel.joints.size());
+    for (auto& joint : hfmModel.joints) {
         joints.push_back(joint);
     }
     buildSkeletonFromJoints(joints);
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 80353523d1..3a384388d0 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -23,7 +23,7 @@ public:
     using Pointer = std::shared_ptr<AnimSkeleton>;
     using ConstPointer = std::shared_ptr<const AnimSkeleton>;
 
-    explicit AnimSkeleton(const HFMModel& model);
+    explicit AnimSkeleton(const HFMModel& hfmModel);
     explicit AnimSkeleton(const std::vector<HFMJoint>& joints);
     int nameToJointIndex(const QString& jointName) const;
     const QString& getJointName(int jointIndex) const;
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 13ee5854bf..36e37dd3d4 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -330,15 +330,15 @@ void SkeletonModel::computeBoundingShape() {
         return;
     }
 
-    const HFMModel& model = getHFMModel();
-    if (model.joints.isEmpty() || model.rootJointIndex == -1) {
+    const HFMModel& hfmModel = getHFMModel();
+    if (hfmModel.joints.isEmpty() || hfmModel.rootJointIndex == -1) {
         // rootJointIndex == -1 if the avatar model has no skeleton
         return;
     }
 
     float radius, height;
     glm::vec3 offset;
-    _rig.computeAvatarBoundingCapsule(model, radius, height, offset);
+    _rig.computeAvatarBoundingCapsule(hfmModel, radius, height, offset);
     float invScale = 1.0f / _owningAvatar->getModelScale();
     _boundingCapsuleRadius = invScale * radius;
     _boundingCapsuleHeight = invScale * height;
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index 9898651268..cef6c9b900 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -206,7 +206,7 @@ void FBXBaker::importScene() {
     }
 #endif
 
-    _model = reader.extractHFMModel({}, _modelURL.toString());
+    _hfmModel = reader.extractHFMModel({}, _modelURL.toString());
     _textureContentMap = reader._textureContent;
 }
 
@@ -231,7 +231,7 @@ void FBXBaker::rewriteAndBakeSceneModels() {
             for (FBXNode& objectChild : rootChild.children) {
                 if (objectChild.name == "Geometry") {
 
-                    // TODO Pull this out of _model instead so we don't have to reprocess it
+                    // TODO Pull this out of _hfmModel instead so we don't have to reprocess it
                     auto extractedMesh = FBXReader::extractMesh(objectChild, meshIndex, false);
                     
                     // Callback to get MaterialID
@@ -293,7 +293,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
     QHash<QString, image::TextureUsage::Type> textureTypes;
 
     // enumerate the materials in the extracted geometry so we can determine the texture type for each texture ID
-    for (const auto& material : _model->materials) {
+    for (const auto& material : _hfmModel->materials) {
         if (material.normalTexture.isBumpmap) {
             textureTypes[material.normalTexture.id] = BUMP_TEXTURE;
         } else {
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 8dfde12b31..2af51b2190 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -53,7 +53,7 @@ private:
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
 
-    HFMModel* _model;
+    HFMModel* _hfmModel;
     QHash<QString, int> _textureNameMatchCount;
     QHash<QUrl, QString> _remappedTexturePaths;
 
diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index 67bd2d5d62..d9f56b393e 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -153,7 +153,7 @@ void OBJBaker::bakeOBJ() {
     checkIfTexturesFinished();
 }
 
-void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
+void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& hfmModel) {
     // Generating FBX Header Node
     FBXNode headerNode;
     headerNode.name = FBX_HEADER_EXTENSION;
@@ -199,7 +199,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
     // Compress the mesh information and store in dracoNode
     bool hasDeformers = false; // No concept of deformers for an OBJ
     FBXNode dracoNode;
-    compressMesh(model.meshes[0], hasDeformers, dracoNode);
+    compressMesh(hfmModel.meshes[0], hasDeformers, dracoNode);
     geometryNode.children.append(dracoNode);
 
     // Generating Object node's child - Model node
@@ -214,17 +214,17 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
     objectNode.children = { geometryNode, modelNode };
 
     // Generating Objects node's child - Material node
-    auto& meshParts = model.meshes[0].parts;
+    auto& meshParts = hfmModel.meshes[0].parts;
     for (auto& meshPart : meshParts) {
         FBXNode materialNode;
         materialNode.name = MATERIAL_NODE_NAME;
-        if (model.materials.size() == 1) {
+        if (hfmModel.materials.size() == 1) {
             // case when no material information is provided, OBJReader considers it as a single default material
-            for (auto& materialID : model.materials.keys()) {
-                setMaterialNodeProperties(materialNode, materialID, model);
+            for (auto& materialID : hfmModel.materials.keys()) {
+                setMaterialNodeProperties(materialNode, materialID, hfmModel);
             }
         } else {
-            setMaterialNodeProperties(materialNode, meshPart.materialID, model);
+            setMaterialNodeProperties(materialNode, meshPart.materialID, hfmModel);
         }
 
         objectNode.children.append(materialNode);
@@ -235,7 +235,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
     auto size = meshParts.size();
     for (int i = 0; i < size; i++) {
         QString material = meshParts[i].materialID;
-        HFMMaterial currentMaterial = model.materials[material];
+        HFMMaterial currentMaterial = hfmModel.materials[material];
         if (!currentMaterial.albedoTexture.filename.isEmpty() || !currentMaterial.specularTexture.filename.isEmpty()) {
             auto textureID = nextNodeID();
             _mapTextureMaterial.emplace_back(textureID, i);
@@ -325,12 +325,12 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMModel& model) {
 }
 
 // Set properties for material nodes
-void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& model) {
+void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& hfmModel) {
     auto materialID = nextNodeID();
     _materialIDs.push_back(materialID);
     materialNode.properties = { materialID, material, MESH };
 
-    HFMMaterial currentMaterial = model.materials[material];
+    HFMMaterial currentMaterial = hfmModel.materials[material];
 
     // Setting the hierarchy: Material -> Properties70 -> P -> Properties
     FBXNode properties70Node;
diff --git a/libraries/baking/src/OBJBaker.h b/libraries/baking/src/OBJBaker.h
index f889730ffa..5aaae49d4a 100644
--- a/libraries/baking/src/OBJBaker.h
+++ b/libraries/baking/src/OBJBaker.h
@@ -39,8 +39,8 @@ private slots:
 
 private:
     void loadOBJ();
-    void createFBXNodeTree(FBXNode& rootNode, HFMModel& model);
-    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& model);
+    void createFBXNodeTree(FBXNode& rootNode, HFMModel& hfmModel);
+    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMModel& hfmModel);
     NodeID nextNodeID() { return _nodeID++; }
 
 
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index 15ba5f0101..2cf57e54b4 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -264,17 +264,17 @@ public:
 };
 
 glm::mat4 getGlobalTransform(const QMultiMap<QString, QString>& _connectionParentMap,
-        const QHash<QString, FBXModel>& models, QString nodeID, bool mixamoHack, const QString& url) {
+        const QHash<QString, FBXModel>& fbxModels, QString nodeID, bool mixamoHack, const QString& url) {
     glm::mat4 globalTransform;
     QVector<QString> visitedNodes; // Used to prevent following a cycle
     while (!nodeID.isNull()) {
         visitedNodes.append(nodeID); // Append each node we visit
 
-        const FBXModel& model = models.value(nodeID);
-        globalTransform = glm::translate(model.translation) * model.preTransform * glm::mat4_cast(model.preRotation *
-            model.rotation * model.postRotation) * model.postTransform * globalTransform;
-        if (model.hasGeometricOffset) {
-            glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(model.geometricScaling, model.geometricRotation, model.geometricTranslation);
+        const FBXModel& fbxModel = fbxModels.value(nodeID);
+        globalTransform = glm::translate(fbxModel.translation) * fbxModel.preTransform * glm::mat4_cast(fbxModel.preRotation *
+            fbxModel.rotation * fbxModel.postRotation) * fbxModel.postTransform * globalTransform;
+        if (fbxModel.hasGeometricOffset) {
+            glm::mat4 geometricOffset = createMatFromScaleQuatAndPos(fbxModel.geometricScaling, fbxModel.geometricRotation, fbxModel.geometricTranslation);
             globalTransform = globalTransform * geometricOffset;
         }
 
@@ -290,7 +290,7 @@ glm::mat4 getGlobalTransform(const QMultiMap<QString, QString>& _connectionParen
                 continue;
             }
 
-            if (models.contains(parentID)) {
+            if (fbxModels.contains(parentID)) {
                 nodeID = parentID;
                 break;
             }
@@ -329,7 +329,7 @@ public:
 };
 
 void appendModelIDs(const QString& parentID, const QMultiMap<QString, QString>& connectionChildMap,
-        QHash<QString, FBXModel>& models, QSet<QString>& remainingModels, QVector<QString>& modelIDs, bool isRootNode = false) {
+        QHash<QString, FBXModel>& fbxModels, QSet<QString>& remainingModels, QVector<QString>& modelIDs, bool isRootNode = false) {
     if (remainingModels.contains(parentID)) {
         modelIDs.append(parentID);
         remainingModels.remove(parentID);
@@ -337,10 +337,10 @@ void appendModelIDs(const QString& parentID, const QMultiMap<QString, QString>&
     int parentIndex = isRootNode ? -1 : modelIDs.size() - 1;
     foreach (const QString& childID, connectionChildMap.values(parentID)) {
         if (remainingModels.contains(childID)) {
-            FBXModel& model = models[childID];
-            if (model.parentIndex == -1) {
-                model.parentIndex = parentIndex;
-                appendModelIDs(childID, connectionChildMap, models, remainingModels, modelIDs);
+            FBXModel& fbxModel = fbxModels[childID];
+            if (fbxModel.parentIndex == -1) {
+                fbxModel.parentIndex = parentIndex;
+                appendModelIDs(childID, connectionChildMap, fbxModels, remainingModels, modelIDs);
             }
         }
     }
@@ -503,7 +503,7 @@ void addBlendshapes(const ExtractedBlendshape& extracted, const QList<WeightedIn
 }
 
 QString getTopModelID(const QMultiMap<QString, QString>& connectionParentMap,
-        const QHash<QString, FBXModel>& models, const QString& modelID, const QString& url) {
+        const QHash<QString, FBXModel>& fbxModels, const QString& modelID, const QString& url) {
     QString topID = modelID;
     QVector<QString> visitedNodes; // Used to prevent following a cycle
     forever {
@@ -515,7 +515,7 @@ QString getTopModelID(const QMultiMap<QString, QString>& connectionParentMap,
                 continue;
             }
 
-            if (models.contains(parentID)) {
+            if (fbxModels.contains(parentID)) {
                 topID = parentID;
                 goto outerContinue;
             }
@@ -689,10 +689,10 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
 #if defined(DEBUG_FBXREADER)
     int unknown = 0;
 #endif
-    HFMModel* modelPtr = new HFMModel;
-    HFMModel& model = *modelPtr;
+    HFMModel* hfmModelPtr = new HFMModel;
+    HFMModel& hfmModel = *hfmModelPtr;
 
-    model.originalURL = url;
+    hfmModel.originalURL = url;
 
     float unitScaleFactor = 1.0f;
     glm::vec3 ambientColor;
@@ -708,7 +708,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
                         if (subobject.name == "MetaData") {
                             foreach (const FBXNode& subsubobject, subobject.children) {
                                 if (subsubobject.name == "Author") {
-                                    model.author = subsubobject.properties.at(0).toString();
+                                    hfmModel.author = subsubobject.properties.at(0).toString();
                                 }
                             }
                         } else if (subobject.name == "Properties70") {
@@ -716,7 +716,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
                                 static const QVariant APPLICATION_NAME = QVariant(QByteArray("Original|ApplicationName"));
                                 if (subsubobject.name == "P" && subsubobject.properties.size() >= 5 &&
                                         subsubobject.properties.at(0) == APPLICATION_NAME) {
-                                    model.applicationName = subsubobject.properties.at(4).toString();
+                                    hfmModel.applicationName = subsubobject.properties.at(4).toString();
                                 }
                             }
                         }
@@ -1307,7 +1307,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
                             name = name.mid(name.lastIndexOf('.') + 1);
                         }
                         QString id = getID(object.properties);
-                        model.blendshapeChannelNames << name;
+                        hfmModel.blendshapeChannelNames << name;
                         foreach (const WeightedIndex& index, blendshapeIndices.values(name)) {
                             blendshapeChannelIndices.insert(id, index);
                         }
@@ -1454,7 +1454,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
     float offsetScale = mapping.value("scale", 1.0f).toFloat() * unitScaleFactor * METERS_PER_CENTIMETER;
     glm::quat offsetRotation = glm::quat(glm::radians(glm::vec3(mapping.value("rx").toFloat(),
             mapping.value("ry").toFloat(), mapping.value("rz").toFloat())));
-    model.offset = glm::translate(glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(),
+    hfmModel.offset = glm::translate(glm::vec3(mapping.value("tx").toFloat(), mapping.value("ty").toFloat(),
         mapping.value("tz").toFloat())) * glm::mat4_cast(offsetRotation) *
             glm::scale(glm::vec3(offsetScale, offsetScale, offsetScale));
 
@@ -1507,12 +1507,12 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         HFMAnimationFrame frame;
         frame.rotations.resize(modelIDs.size());
         frame.translations.resize(modelIDs.size());
-        model.animationFrames.append(frame);
+        hfmModel.animationFrames.append(frame);
     }
 
     // convert the models to joints
     QVariantList freeJoints = mapping.values("freeJoint");
-    model.hasSkeletonJoints = false;
+    hfmModel.hasSkeletonJoints = false;
     foreach (const QString& modelID, modelIDs) {
         const FBXModel& fbxModel = fbxModels[modelID];
         HFMJoint joint;
@@ -1520,11 +1520,11 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         joint.parentIndex = fbxModel.parentIndex;
 
         // get the indices of all ancestors starting with the first free one (if any)
-        int jointIndex = model.joints.size();
+        int jointIndex = hfmModel.joints.size();
         joint.freeLineage.append(jointIndex);
         int lastFreeIndex = joint.isFree ? 0 : -1;
-        for (int index = joint.parentIndex; index != -1; index = model.joints.at(index).parentIndex) {
-            if (model.joints.at(index).isFree) {
+        for (int index = joint.parentIndex; index != -1; index = hfmModel.joints.at(index).parentIndex) {
+            if (hfmModel.joints.at(index).isFree) {
                 lastFreeIndex = joint.freeLineage.size();
             }
             joint.freeLineage.append(index);
@@ -1547,13 +1547,13 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         glm::quat combinedRotation = joint.preRotation * joint.rotation * joint.postRotation;
 
         if (joint.parentIndex == -1) {
-            joint.transform = model.offset * glm::translate(joint.translation) * joint.preTransform *
+            joint.transform = hfmModel.offset * glm::translate(joint.translation) * joint.preTransform *
                 glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation);
             joint.distanceToParent = 0.0f;
 
         } else {
-            const HFMJoint& parentJoint = model.joints.at(joint.parentIndex);
+            const HFMJoint& parentJoint = hfmModel.joints.at(joint.parentIndex);
             joint.transform = parentJoint.transform * glm::translate(joint.translation) *
                 joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation) * parentJoint.inverseDefaultRotation;
@@ -1566,15 +1566,15 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         foreach (const QString& childID, _connectionChildMap.values(modelID)) {
             QString type = typeFlags.value(childID);
             if (!type.isEmpty()) {
-                model.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
+                hfmModel.hasSkeletonJoints |= (joint.isSkeletonJoint = type.toLower().contains("Skeleton"));
                 break;
             }
         }
 
         joint.bindTransformFoundInCluster = false;
 
-        model.joints.append(joint);
-        model.jointIndices.insert(fbxModel.name, model.joints.size());
+        hfmModel.joints.append(joint);
+        hfmModel.jointIndices.insert(fbxModel.name, hfmModel.joints.size());
 
         QString rotationID = localRotations.value(modelID);
         AnimationCurve xRotCurve = animationCurves.value(xComponents.value(rotationID));
@@ -1590,11 +1590,11 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         glm::vec3 defaultPosValues = joint.translation;
 
         for (int i = 0; i < frameCount; i++) {
-            model.animationFrames[i].rotations[jointIndex] = glm::quat(glm::radians(glm::vec3(
+            hfmModel.animationFrames[i].rotations[jointIndex] = glm::quat(glm::radians(glm::vec3(
                 xRotCurve.values.isEmpty() ? defaultRotValues.x : xRotCurve.values.at(i % xRotCurve.values.size()),
                 yRotCurve.values.isEmpty() ? defaultRotValues.y : yRotCurve.values.at(i % yRotCurve.values.size()),
                 zRotCurve.values.isEmpty() ? defaultRotValues.z : zRotCurve.values.at(i % zRotCurve.values.size()))));
-            model.animationFrames[i].translations[jointIndex] = glm::vec3(
+            hfmModel.animationFrames[i].translations[jointIndex] = glm::vec3(
                 xPosCurve.values.isEmpty() ? defaultPosValues.x : xPosCurve.values.at(i % xPosCurve.values.size()),
                 yPosCurve.values.isEmpty() ? defaultPosValues.y : yPosCurve.values.at(i % yPosCurve.values.size()),
                 zPosCurve.values.isEmpty() ? defaultPosValues.z : zPosCurve.values.at(i % zPosCurve.values.size()));
@@ -1603,32 +1603,32 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
 
     // NOTE: shapeVertices are in joint-frame
     std::vector<ShapeVertices> shapeVertices;
-    shapeVertices.resize(std::max(1, model.joints.size()) );
+    shapeVertices.resize(std::max(1, hfmModel.joints.size()) );
 
     // find our special joints
-    model.leftEyeJointIndex = modelIDs.indexOf(jointEyeLeftID);
-    model.rightEyeJointIndex = modelIDs.indexOf(jointEyeRightID);
-    model.neckJointIndex = modelIDs.indexOf(jointNeckID);
-    model.rootJointIndex = modelIDs.indexOf(jointRootID);
-    model.leanJointIndex = modelIDs.indexOf(jointLeanID);
-    model.headJointIndex = modelIDs.indexOf(jointHeadID);
-    model.leftHandJointIndex = modelIDs.indexOf(jointLeftHandID);
-    model.rightHandJointIndex = modelIDs.indexOf(jointRightHandID);
-    model.leftToeJointIndex = modelIDs.indexOf(jointLeftToeID);
-    model.rightToeJointIndex = modelIDs.indexOf(jointRightToeID);
+    hfmModel.leftEyeJointIndex = modelIDs.indexOf(jointEyeLeftID);
+    hfmModel.rightEyeJointIndex = modelIDs.indexOf(jointEyeRightID);
+    hfmModel.neckJointIndex = modelIDs.indexOf(jointNeckID);
+    hfmModel.rootJointIndex = modelIDs.indexOf(jointRootID);
+    hfmModel.leanJointIndex = modelIDs.indexOf(jointLeanID);
+    hfmModel.headJointIndex = modelIDs.indexOf(jointHeadID);
+    hfmModel.leftHandJointIndex = modelIDs.indexOf(jointLeftHandID);
+    hfmModel.rightHandJointIndex = modelIDs.indexOf(jointRightHandID);
+    hfmModel.leftToeJointIndex = modelIDs.indexOf(jointLeftToeID);
+    hfmModel.rightToeJointIndex = modelIDs.indexOf(jointRightToeID);
 
     foreach (const QString& id, humanIKJointIDs) {
-        model.humanIKJointIndices.append(modelIDs.indexOf(id));
+        hfmModel.humanIKJointIndices.append(modelIDs.indexOf(id));
     }
 
     // extract the translation component of the neck transform
-    if (model.neckJointIndex != -1) {
-        const glm::mat4& transform = model.joints.at(model.neckJointIndex).transform;
-        model.neckPivot = glm::vec3(transform[3][0], transform[3][1], transform[3][2]);
+    if (hfmModel.neckJointIndex != -1) {
+        const glm::mat4& transform = hfmModel.joints.at(hfmModel.neckJointIndex).transform;
+        hfmModel.neckPivot = glm::vec3(transform[3][0], transform[3][1], transform[3][2]);
     }
 
-    model.bindExtents.reset();
-    model.meshExtents.reset();
+    hfmModel.bindExtents.reset();
+    hfmModel.meshExtents.reset();
 
     // Create the Material Library
     consolidateHFMMaterials(mapping);
@@ -1664,7 +1664,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         }
     }
 #endif
-    model.materials = _hfmMaterials;
+    hfmModel.materials = _hfmMaterials;
 
     // see if any materials have texture children
     bool materialsHaveTextures = checkMaterialsHaveTextures(_hfmMaterials, _textureFilenames, _connectionChildMap);
@@ -1676,13 +1676,13 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
 
         // accumulate local transforms
         QString modelID = fbxModels.contains(it.key()) ? it.key() : _connectionParentMap.value(it.key());
-        glm::mat4 modelTransform = getGlobalTransform(_connectionParentMap, fbxModels, modelID, model.applicationName == "mixamo.com", url);
+        glm::mat4 modelTransform = getGlobalTransform(_connectionParentMap, fbxModels, modelID, hfmModel.applicationName == "mixamo.com", url);
 
         // compute the mesh extents from the transformed vertices
         foreach (const glm::vec3& vertex, extracted.mesh.vertices) {
             glm::vec3 transformedVertex = glm::vec3(modelTransform * glm::vec4(vertex, 1.0f));
-            model.meshExtents.minimum = glm::min(model.meshExtents.minimum, transformedVertex);
-            model.meshExtents.maximum = glm::max(model.meshExtents.maximum, transformedVertex);
+            hfmModel.meshExtents.minimum = glm::min(hfmModel.meshExtents.minimum, transformedVertex);
+            hfmModel.meshExtents.maximum = glm::max(hfmModel.meshExtents.maximum, transformedVertex);
 
             extracted.mesh.meshExtents.minimum = glm::min(extracted.mesh.meshExtents.minimum, transformedVertex);
             extracted.mesh.meshExtents.maximum = glm::max(extracted.mesh.meshExtents.maximum, transformedVertex);
@@ -1763,14 +1763,14 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
                 extracted.mesh.clusters.append(hfmCluster);
 
                 // override the bind rotation with the transform link
-                HFMJoint& joint = model.joints[hfmCluster.jointIndex];
+                HFMJoint& joint = hfmModel.joints[hfmCluster.jointIndex];
                 joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
                 joint.bindTransform = cluster.transformLink;
                 joint.bindTransformFoundInCluster = true;
 
                 // update the bind pose extents
-                glm::vec3 bindTranslation = extractTranslation(model.offset * joint.bindTransform);
-                model.bindExtents.addPoint(bindTranslation);
+                glm::vec3 bindTranslation = extractTranslation(hfmModel.offset * joint.bindTransform);
+                hfmModel.bindExtents.addPoint(bindTranslation);
             }
         }
 
@@ -1801,14 +1801,14 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
                 const Cluster& cluster = clusters[clusterID];
                 const HFMCluster& hfmCluster = extracted.mesh.clusters.at(i);
                 int jointIndex = hfmCluster.jointIndex;
-                HFMJoint& joint = model.joints[jointIndex];
+                HFMJoint& joint = hfmModel.joints[jointIndex];
                 glm::mat4 transformJointToMesh = inverseModelTransform * joint.bindTransform;
                 glm::vec3 boneEnd = extractTranslation(transformJointToMesh);
                 glm::vec3 boneBegin = boneEnd;
                 glm::vec3 boneDirection;
                 float boneLength = 0.0f;
                 if (joint.parentIndex != -1) {
-                    boneBegin = extractTranslation(inverseModelTransform * model.joints[joint.parentIndex].bindTransform);
+                    boneBegin = extractTranslation(inverseModelTransform * hfmModel.joints[joint.parentIndex].bindTransform);
                     boneDirection = boneEnd - boneBegin;
                     boneLength = glm::length(boneDirection);
                     if (boneLength > EPSILON) {
@@ -1882,7 +1882,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         } else {
             // this is a single-mesh joint
             int jointIndex = firstHFMCluster.jointIndex;
-            HFMJoint& joint = model.joints[jointIndex];
+            HFMJoint& joint = hfmModel.joints[jointIndex];
 
             // transform cluster vertices to joint-frame and save for later
             glm::mat4 meshToJoint = glm::inverse(joint.bindTransform) * modelTransform;
@@ -1902,8 +1902,8 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
         }
         buildModelMesh(extracted.mesh, url);
 
-        model.meshes.append(extracted.mesh);
-        int meshIndex = model.meshes.size() - 1;
+        hfmModel.meshes.append(extracted.mesh);
+        int meshIndex = hfmModel.meshes.size() - 1;
         if (extracted.mesh._mesh) {
             extracted.mesh._mesh->displayName = QString("%1#/mesh/%2").arg(url).arg(meshIndex).toStdString();
             extracted.mesh._mesh->modelName = modelIDsToNames.value(modelID).toStdString();
@@ -1923,8 +1923,8 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
     };
 
     // now that all joints have been scanned compute a k-Dop bounding volume of mesh
-    for (int i = 0; i < model.joints.size(); ++i) {
-        HFMJoint& joint = model.joints[i];
+    for (int i = 0; i < hfmModel.joints.size(); ++i) {
+        HFMJoint& joint = hfmModel.joints[i];
 
         // NOTE: points are in joint-frame
         ShapeVertices& points = shapeVertices.at(i);
@@ -1958,7 +1958,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
             generateBoundryLinesForDop14(joint.shapeInfo.dots, joint.shapeInfo.avgPoint, joint.shapeInfo.debugLines);
         }
     }
-    model.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
+    hfmModel.palmDirection = parseVec3(mapping.value("palmDirection", "0, -1, 0").toString());
 
     // attempt to map any meshes to a named model
     for (QHash<QString, int>::const_iterator m = meshIDsToMeshIndices.constBegin();
@@ -1971,14 +1971,14 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
             const QString& modelID = ooChildToParent.value(meshID);
             if (modelIDsToNames.contains(modelID)) {
                 const QString& modelName = modelIDsToNames.value(modelID);
-                model.meshIndicesToModelNames.insert(meshIndex, modelName);
+                hfmModel.meshIndicesToModelNames.insert(meshIndex, modelName);
             }
         }
     }
     {
         int i = 0;
-        for (const auto& mesh : model.meshes) {
-            auto name = model.getModelNameOfMesh(i++);
+        for (const auto& mesh : hfmModel.meshes) {
+            auto name = hfmModel.getModelNameOfMesh(i++);
             if (!name.isEmpty()) {
                 if (mesh._mesh) {
                     mesh._mesh->modelName = name.toStdString();
@@ -1991,7 +1991,7 @@ HFMModel* FBXReader::extractHFMModel(const QVariantHash& mapping, const QString&
             }
         }
     }
-    return modelPtr;
+    return hfmModelPtr;
 }
 
 HFMModel* readFBX(const QByteArray& data, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp
index cc1f3bec1c..9cd43ddf08 100644
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@@ -697,7 +697,7 @@ glm::mat4 GLTFReader::getModelTransform(const GLTFNode& node) {
     return tmat;
 }
 
-bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
+bool GLTFReader::buildGeometry(HFMModel& hfmModel, const QUrl& url) {
 
     //Build dependencies
     QVector<QVector<int>> nodeDependencies(_file.nodes.size());
@@ -727,17 +727,17 @@ bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
     }
     
     //Build default joints
-    model.joints.resize(1);
-    model.joints[0].isFree = false;
-    model.joints[0].parentIndex = -1;
-    model.joints[0].distanceToParent = 0;
-    model.joints[0].translation = glm::vec3(0, 0, 0);
-    model.joints[0].rotationMin = glm::vec3(0, 0, 0);
-    model.joints[0].rotationMax = glm::vec3(0, 0, 0);
-    model.joints[0].name = "OBJ";
-    model.joints[0].isSkeletonJoint = true;
+    hfmModel.joints.resize(1);
+    hfmModel.joints[0].isFree = false;
+    hfmModel.joints[0].parentIndex = -1;
+    hfmModel.joints[0].distanceToParent = 0;
+    hfmModel.joints[0].translation = glm::vec3(0, 0, 0);
+    hfmModel.joints[0].rotationMin = glm::vec3(0, 0, 0);
+    hfmModel.joints[0].rotationMax = glm::vec3(0, 0, 0);
+    hfmModel.joints[0].name = "OBJ";
+    hfmModel.joints[0].isSkeletonJoint = true;
 
-    model.jointIndices["x"] = 1;
+    hfmModel.jointIndices["x"] = 1;
 
     //Build materials
     QVector<QString> materialIDs;
@@ -750,8 +750,8 @@ bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
 
     for (int i = 0; i < materialIDs.size(); i++) {
         QString& matid = materialIDs[i];
-        model.materials[matid] = HFMMaterial();
-        HFMMaterial& hfmMaterial = model.materials[matid];
+        hfmModel.materials[matid] = HFMMaterial();
+        HFMMaterial& hfmMaterial = hfmModel.materials[matid];
         hfmMaterial._material = std::make_shared<graphics::Material>();
         setHFMMaterial(hfmMaterial, _file.materials[i]);
     }
@@ -765,8 +765,8 @@ bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
         if (node.defined["mesh"]) {
             qCDebug(modelformat) << "node_transforms" << node.transforms;
             foreach(auto &primitive, _file.meshes[node.mesh].primitives) {
-                model.meshes.append(HFMMesh());
-                HFMMesh& mesh = model.meshes[model.meshes.size() - 1];
+                hfmModel.meshes.append(HFMMesh());
+                HFMMesh& mesh = hfmModel.meshes[hfmModel.meshes.size() - 1];
                 HFMCluster cluster;
                 cluster.jointIndex = 0;
                 cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
@@ -886,7 +886,7 @@ bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
                 mesh.meshExtents.reset();
                 foreach(const glm::vec3& vertex, mesh.vertices) {
                     mesh.meshExtents.addPoint(vertex);
-                    model.meshExtents.addPoint(vertex);
+                    hfmModel.meshExtents.addPoint(vertex);
                 }
                 
                 // since mesh.modelTransform seems to not have any effect I apply the transformation the model 
@@ -898,7 +898,7 @@ bool GLTFReader::buildGeometry(HFMModel& model, const QUrl& url) {
                     }
                 }
 
-                mesh.meshIndex = model.meshes.size();
+                mesh.meshIndex = hfmModel.meshes.size();
                 FBXReader::buildModelMesh(mesh, url.toString());
             }
             
@@ -924,13 +924,13 @@ HFMModel* GLTFReader::readGLTF(QByteArray& data, const QVariantHash& mapping,
 
     parseGLTF(data);
     //_file.dump();
-    HFMModel* modelPtr = new HFMModel();
-    HFMModel& model = *modelPtr;
+    HFMModel* hfmModelPtr = new HFMModel();
+    HFMModel& hfmModel = *hfmModelPtr;
 
-    buildGeometry(model, url);
+    buildGeometry(hfmModel, url);
     
     //hfmDebugDump(data);
-    return modelPtr;
+    return hfmModelPtr;
     
 }
 
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index 544c85f1c1..44186504f0 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -706,7 +706,7 @@ class GLTFReader : public QObject {
     Q_OBJECT
 public:
     GLTFReader();
-    HFMModel* readGLTF(QByteArray& model, const QVariantHash& mapping, 
+    HFMModel* readGLTF(QByteArray& data, const QVariantHash& mapping, 
                           const QUrl& url, bool loadLightmaps = true, float lightmapLevel = 1.0f);
 private:
     GLTFFile _file;
@@ -714,7 +714,7 @@ private:
 
     glm::mat4 getModelTransform(const GLTFNode& node);
 
-    bool buildGeometry(HFMModel& model, const QUrl& url);
+    bool buildGeometry(HFMModel& hfmModel, const QUrl& url);
     bool parseGLTF(const QByteArray& data);
     
     bool getStringVal(const QJsonObject& object, const QString& fieldname, 
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index a37359aa2a..87fae0e965 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -488,10 +488,10 @@ QNetworkReply* request(QUrl& url, bool isTest) {
 }
 
 
-bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& model,
+bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& hfmModel,
                               float& scaleGuess, bool combineParts) {
     FaceGroup faces;
-    HFMMesh& mesh = model.meshes[0];
+    HFMMesh& mesh = hfmModel.meshes[0];
     mesh.parts.append(HFMMeshPart());
     HFMMeshPart& meshPart = mesh.parts.last();
     bool sawG = false;
@@ -657,36 +657,36 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
     QBuffer buffer { &data };
     buffer.open(QIODevice::ReadOnly);
 
-    auto modelPtr { std::make_shared<HFMModel>() };
-    HFMModel& model { *modelPtr };
+    auto hfmModelPtr { std::make_shared<HFMModel>() };
+    HFMModel& hfmModel { *hfmModelPtr };
     OBJTokenizer tokenizer { &buffer };
     float scaleGuess = 1.0f;
 
     bool needsMaterialLibrary = false;
 
     _url = url;
-    model.meshExtents.reset();
-    model.meshes.append(HFMMesh());
+    hfmModel.meshExtents.reset();
+    hfmModel.meshes.append(HFMMesh());
 
     try {
         // call parseOBJGroup as long as it's returning true.  Each successful call will
         // add a new meshPart to the model's single mesh.
-        while (parseOBJGroup(tokenizer, mapping, model, scaleGuess, combineParts)) {}
+        while (parseOBJGroup(tokenizer, mapping, hfmModel, scaleGuess, combineParts)) {}
 
-        HFMMesh& mesh = model.meshes[0];
+        HFMMesh& mesh = hfmModel.meshes[0];
         mesh.meshIndex = 0;
 
-        model.joints.resize(1);
-        model.joints[0].isFree = false;
-        model.joints[0].parentIndex = -1;
-        model.joints[0].distanceToParent = 0;
-        model.joints[0].translation = glm::vec3(0, 0, 0);
-        model.joints[0].rotationMin = glm::vec3(0, 0, 0);
-        model.joints[0].rotationMax = glm::vec3(0, 0, 0);
-        model.joints[0].name = "OBJ";
-        model.joints[0].isSkeletonJoint = true;
+        hfmModel.joints.resize(1);
+        hfmModel.joints[0].isFree = false;
+        hfmModel.joints[0].parentIndex = -1;
+        hfmModel.joints[0].distanceToParent = 0;
+        hfmModel.joints[0].translation = glm::vec3(0, 0, 0);
+        hfmModel.joints[0].rotationMin = glm::vec3(0, 0, 0);
+        hfmModel.joints[0].rotationMax = glm::vec3(0, 0, 0);
+        hfmModel.joints[0].name = "OBJ";
+        hfmModel.joints[0].isSkeletonJoint = true;
 
-        model.jointIndices["x"] = 1;
+        hfmModel.jointIndices["x"] = 1;
 
         HFMCluster cluster;
         cluster.jointIndex = 0;
@@ -818,13 +818,13 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
         mesh.meshExtents.reset();
         foreach(const glm::vec3& vertex, mesh.vertices) {
             mesh.meshExtents.addPoint(vertex);
-            model.meshExtents.addPoint(vertex);
+            hfmModel.meshExtents.addPoint(vertex);
         }
 
         // Build the single mesh.
         FBXReader::buildModelMesh(mesh, url.toString());
 
-        // hfmDebugDump(model);
+        // hfmDebugDump(hfmModel);
     } catch(const std::exception& e) {
         qCDebug(modelformat) << "OBJ reader fail: " << e.what();
     }
@@ -885,12 +885,12 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
         if (!objMaterial.used) {
             continue;
         }
-        model.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
+        hfmModel.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
                                                      objMaterial.specularColor,
                                                      objMaterial.emissiveColor,
                                                      objMaterial.shininess,
                                                      objMaterial.opacity);
-        HFMMaterial& hfmMaterial = model.materials[materialID];
+        HFMMaterial& hfmMaterial = hfmModel.materials[materialID];
         hfmMaterial.materialID = materialID;
         hfmMaterial._material = std::make_shared<graphics::Material>();
         graphics::MaterialPointer modelMaterial = hfmMaterial._material;
@@ -988,7 +988,7 @@ HFMModel::Pointer OBJReader::readOBJ(QByteArray& data, const QVariantHash& mappi
         modelMaterial->setOpacity(hfmMaterial.opacity);
     }
 
-    return modelPtr;
+    return hfmModelPtr;
 }
 
 void hfmDebugDump(const HFMModel& hfmModel) {
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index 1b259d90df..0088e8e9d7 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -93,7 +93,7 @@ private:
     QUrl _url;
 
     QHash<QByteArray, bool> librariesSeen;
-    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& model,
+    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMModel& hfmModel,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index b5367a77ca..8de9c39da9 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -22,8 +22,8 @@
 bool HFMModelLessThan(const HFMMesh& e1, const HFMMesh& e2) {
     return e1.meshIndex < e2.meshIndex;
 }
-void reSortHFMModelMeshes(HFMModel& model) {
-    qSort(model.meshes.begin(), model.meshes.end(), HFMModelLessThan);
+void reSortHFMModelMeshes(HFMModel& hfmModel) {
+    qSort(hfmModel.meshes.begin(), hfmModel.meshes.end(), HFMModelLessThan);
 }
 
 
@@ -41,17 +41,17 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMModel& result) {
     }
     try {
         QByteArray fbxContents = fbx.readAll();
-        HFMModel::Pointer model;
+        HFMModel::Pointer hfmModel;
         if (filename.toLower().endsWith(".obj")) {
             bool combineParts = false;
-            model = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
+            hfmModel = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
         } else if (filename.toLower().endsWith(".fbx")) {
-            model.reset(readFBX(fbxContents, QVariantHash(), filename));
+            hfmModel.reset(readFBX(fbxContents, QVariantHash(), filename));
         } else {
             qWarning() << "file has unknown extension" << filename;
             return false;
         }
-        result = *model;
+        result = *hfmModel;
 
         reSortHFMModelMeshes(result);
     } catch (const QString& error) {
@@ -288,17 +288,17 @@ float computeDt(uint64_t start) {
     return (float)(usecTimestampNow() - start) / (float)USECS_PER_SECOND;
 }
 
-bool vhacd::VHACDUtil::computeVHACD(HFMModel& model,
+bool vhacd::VHACDUtil::computeVHACD(HFMModel& hfmModel,
                                     VHACD::IVHACD::Parameters params,
                                     HFMModel& result,
                                     float minimumMeshSize, float maximumMeshSize) {
     if (_verbose) {
-        qDebug() << "meshes =" << model.meshes.size();
+        qDebug() << "meshes =" << hfmModel.meshes.size();
     }
 
     // count the mesh-parts
     int numParts = 0;
-    foreach (const HFMMesh& mesh, model.meshes) {
+    foreach (const HFMMesh& mesh, hfmModel.meshes) {
         numParts += mesh.parts.size();
     }
     if (_verbose) {
@@ -316,7 +316,7 @@ bool vhacd::VHACDUtil::computeVHACD(HFMModel& model,
 
     int meshIndex = 0;
     int validPartsFound = 0;
-    foreach (const HFMMesh& mesh, model.meshes) {
+    foreach (const HFMMesh& mesh, hfmModel.meshes) {
 
         // find duplicate points
         int numDupes = 0;
@@ -337,7 +337,7 @@ bool vhacd::VHACDUtil::computeVHACD(HFMModel& model,
 
         // each mesh has its own transform to move it to model-space
         std::vector<glm::vec3> vertices;
-        glm::mat4 totalTransform = model.offset * mesh.modelTransform;
+        glm::mat4 totalTransform = hfmModel.offset * mesh.modelTransform;
         foreach (glm::vec3 vertex, mesh.vertices) {
             vertices.push_back(glm::vec3(totalTransform * glm::vec4(vertex, 1.0f)));
         }
diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h
index 6ef568d170..dd8f606756 100644
--- a/tools/vhacd-util/src/VHACDUtil.h
+++ b/tools/vhacd-util/src/VHACDUtil.h
@@ -31,7 +31,7 @@ namespace vhacd {
 
         void fattenMesh(const HFMMesh& mesh, const glm::mat4& modelOffset, HFMMesh& result) const;
 
-        bool computeVHACD(HFMModel& model,
+        bool computeVHACD(HFMModel& hfmModel,
                           VHACD::IVHACD::Parameters params,
                           HFMModel& result,
                           float minimumMeshSize, float maximumMeshSize);
diff --git a/tools/vhacd-util/src/VHACDUtilApp.h b/tools/vhacd-util/src/VHACDUtilApp.h
index 72e8cfb7e4..7dadad20b3 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.h
+++ b/tools/vhacd-util/src/VHACDUtilApp.h
@@ -28,7 +28,7 @@ public:
     VHACDUtilApp(int argc, char* argv[]);
     ~VHACDUtilApp();
 
-    bool writeOBJ(QString outFileName, HFMModel& model, bool outputCentimeters, int whichMeshPart = -1);
+    bool writeOBJ(QString outFileName, HFMModel& hfmModel, bool outputCentimeters, int whichMeshPart = -1);
 
     int getReturnCode() const { return _returnCode; }
 

From 515ff016a46c079d234705dc107cb21415a5d8a0 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 5 Nov 2018 13:03:34 -0800
Subject: [PATCH 58/73] Fix seven bugs

---
 .../qml/hifi/commerce/checkout/Checkout.qml   |  7 +----
 .../qml/hifi/commerce/wallet/Help.qml         |  2 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       | 20 ++++++++------
 .../qml/hifi/dialogs/security/Security.qml    |  2 +-
 scripts/system/commerce/wallet.js             |  8 +++---
 scripts/system/marketplaces/marketplaces.js   | 27 ++++++++++++++++---
 6 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index db030d2fee..271aab87d1 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -240,11 +240,6 @@ Rectangle {
                     lightboxPopup.button1method = function() {
                         lightboxPopup.visible = false;
                     }
-                    lightboxPopup.button2text = "GO TO WALLET";
-                    lightboxPopup.button2method = function() {
-                        lightboxPopup.visible = false;
-                        sendToScript({method: 'checkout_openWallet'});
-                    };
                     lightboxPopup.visible = true;
                 } else {
                     sendToScript(msg);
@@ -903,7 +898,7 @@ Rectangle {
             horizontalAlignment: Text.AlignLeft;
             verticalAlignment: Text.AlignVCenter;
             onLinkActivated: {
-                sendToScript({method: 'checkout_openWallet'});
+                sendToScript({method: 'checkout_openRecentActivity'});
             }
         }
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 6cf00f78eb..575edfc34d 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -62,7 +62,7 @@ Item {
             isExpanded: false;
             question: "How can I get HFC?";
             answer: "High Fidelity commerce is in open beta right now. Want more HFC? \
-Get it by going to <br><br><b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity.</a></font></b> and meeting with the banker!";
+Get it by going to <b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity</a></font></b> and meeting with the banker!";
         }
         ListElement {
             isExpanded: false;
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index 97736bf781..76c2484f0b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -29,6 +29,7 @@ Rectangle {
     id: root;
 
     property string activeView: "initialize";
+    property string initialActiveViewAfterStatus5: "walletInventory";
     property bool keyboardRaised: false;
     property bool isPassword: false;
 
@@ -66,7 +67,7 @@ Rectangle {
                 }
             } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
-                    root.activeView = "walletInventory";
+                    root.activeView = root.initialActiveViewAfterStatus5;
                     Commerce.getAvailableUpdates();
                     Commerce.getSecurityImage();
                 }
@@ -526,7 +527,7 @@ Rectangle {
                 id: exchangeMoneyMessagesWaitingLight;
                 visible: parent.messagesWaiting;
                 anchors.right: exchangeMoneyTabIcon.left;
-                anchors.rightMargin: -4;
+                anchors.rightMargin: 9;
                 anchors.top: exchangeMoneyTabIcon.top;
                 anchors.topMargin: 16;
                 height: 10;
@@ -682,15 +683,12 @@ Rectangle {
         function resetTabButtonColors() {
             walletHomeButtonContainer.color = hifi.colors.black;
             sendMoneyButtonContainer.color = hifi.colors.black;
-            securityButtonContainer.color = hifi.colors.black;
             helpButtonContainer.color = hifi.colors.black;
             exchangeMoneyButtonContainer.color = hifi.colors.black;
             if (root.activeView === "walletHome") {
                 walletHomeButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "sendMoney") {
                 sendMoneyButtonContainer.color = hifi.colors.blueAccent;
-            } else if (root.activeView === "security") {
-                securityButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "help") {
                 helpButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView == "walletInventory") {
@@ -760,10 +758,12 @@ Rectangle {
             break;
             case 'updateConnections':
                 sendMoney.updateConnections(message.connections);
+                walletInventory.fromScript(message);
             break;
             case 'selectRecipient':
             case 'updateSelectedRecipientUsername':
                 sendMoney.fromScript(message);
+                walletInventory.fromScript(message);
             break;
             case 'http.response':
                 http.handleHttpResponse(message);
@@ -779,15 +779,19 @@ Rectangle {
             break;
             case 'updatePurchases':
             case 'purchases_showMyItems':
-            case 'updateConnections':
-            case 'selectRecipient':
-            case 'updateSelectedRecipientUsername':
             case 'updateWearables':
                 walletInventory.fromScript(message);
             break;
             case 'updateRecentActivityMessageLight':
                 walletHomeButtonContainer.messagesWaiting = message.messagesWaiting;
             break;
+            case 'checkout_openRecentActivity':
+                if (root.activeView === "initialize") {
+                    root.initialActiveViewAfterStatus5 = "walletHome";
+                } else {
+                    root.activeView = "walletHome";
+                }
+            break;
             default:
                 console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
         }
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 8baff0ac13..96a554838f 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -328,7 +328,7 @@ Rectangle {
 
                 HifiStylesUit.RalewayRegular {
                     text: "Your wallet is not set up.\n" +
-                        "Open the WALLET app to get started.";
+                        "Open the ASSETS app to get started.";
                     // Anchors
                     anchors.fill: parent;
                     // Text size
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 837cf6a78a..033ca638e4 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -18,7 +18,7 @@ Script.include("/~/system/libraries/accountUtils.js");
 Script.include("/~/system/libraries/connectionUtils.js");
 var AppUi = Script.require('appUi');
 
-    var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";;
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 
 // BEGIN AVATAR SELECTOR LOGIC
 var UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6 };
@@ -607,13 +607,13 @@ function notificationPollCallbackHistory(historyArray) {
         if (notificationCount > 0) {
             var message;
             if (!ui.notificationInitialCallbackMade[1]) {
-                message = "You have " + notificationCount + " unread wallet " +
-                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open WALLET to see all activity.";
+                message = "You have " + notificationCount + " unread recent " +
+                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open ASSETS to see all activity.";
                 ui.notificationDisplayBanner(message);
             } else {
                 for (var i = 0; i < notificationCount; i++) {
                     message = '"' + (historyArray[i].message) + '" ' +
-                        "Open WALLET to see all activity.";
+                        "Open ASSETS to see all activity.";
                     ui.notificationDisplayBanner(message);
                 }
             }
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index ed8ed9f288..8bfd776971 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -527,7 +527,13 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
             Window.location = "hifi://BankOfHighFidelity";
         }
         break;
-    case 'checkout_openWallet':
+    case 'checkout_openRecentActivity':
+        ui.open(MARKETPLACE_WALLET_QML_PATH);
+        wireQmlEventBridge(true);
+        ui.tablet.sendToQml({
+            method: 'checkout_openRecentActivity'
+        });
+        break;
     case 'checkout_setUpClicked':
         openWallet();
         break;
@@ -589,9 +595,6 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
         break;
     case 'updateItemClicked':
         openMarketplace(message.upgradeUrl + "?edition=" + message.itemEdition);
-        break;
-    case 'giftAsset':
-
         break;
     case 'passphrasePopup_cancelClicked':
     case 'needsLogIn_cancelClicked':
@@ -635,6 +638,20 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     case 'http.request':
         // Handled elsewhere, don't log.
         break;
+    // All of these are handled by wallet.js
+    case 'purchases_updateWearables':
+    case 'enable_ChooseRecipientNearbyMode':
+    case 'disable_ChooseRecipientNearbyMode':
+    case 'sendAsset_sendPublicly':
+    case 'refreshConnections':
+    case 'transactionHistory_goToBank':
+    case 'purchases_walletNotSetUp':
+    case 'purchases_openGoTo':
+    case 'purchases_itemInfoClicked':
+    case 'purchases_itemCertificateClicked':
+        case 'clearShouldShowDotHistory':
+        case 'giftAsset':
+        break;
     default:
         print('Unrecognized message from Checkout.qml: ' + JSON.stringify(message));
     }
@@ -705,6 +722,8 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
             referrerURL: referrerURL,
             filterText: filterText
         });
+        referrerURL = "";
+        filterText = "";
     }
 
     ui.isOpen = (onMarketplaceScreen || onCommerceScreen) && !onWalletScreen;

From f10b9ae30cb234c6528edc91f2721f47355f89f8 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 5 Nov 2018 13:12:43 -0800
Subject: [PATCH 59/73] Squashed commit of the following:

commit 515ff016a46c079d234705dc107cb21415a5d8a0
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 13:03:34 2018 -0800

    Fix seven bugs

commit a4d36b384551abfa8d83e3ff560b9f271d4aea6b
Merge: 8906b909eb d0181283dd
Author: Zach Fox <fox@highfidelity.io>
Date:   Mon Nov 5 10:25:58 2018 -0800

    Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce

commit d0181283dda0f10856112e0d302258412ede36b3
Merge: be17ed0910 643026abd6
Author: Brad Hefta-Gaub <brad@highfidelity.io>
Date:   Fri Nov 2 16:44:31 2018 -0700

    Merge pull request #14308 from sabrina-shanman/fbx2hfm

    (case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes

commit 643026abd61ed38f0907bb65da7693a13110a432
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:15:30 2018 -0700

    Change local variable in TestFbx for clarity

commit 0b7ddca5f66058e5df4fe7d356362f1358dcfcc7
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Wed Oct 31 14:03:20 2018 -0700

    Change naming for straggler names in model loading debug dumps

commit becee7f010571d3ffd61deeb062d16a73a06e2a1
Author: sabrina-shanman <sabrina@highfidelity.io>
Date:   Tue Oct 30 17:28:42 2018 -0700

    Re-name FBXGeometry to HFMGeometry and do the same for related classes
---
 .../src/avatars/ScriptableAvatar.cpp          |  12 +-
 .../qml/hifi/commerce/checkout/Checkout.qml   |   7 +-
 .../qml/hifi/commerce/wallet/Help.qml         |   2 +-
 .../qml/hifi/commerce/wallet/Wallet.qml       |  18 ++-
 .../qml/hifi/dialogs/security/Security.qml    |   2 +-
 interface/src/ModelPackager.cpp               |   4 +-
 interface/src/ModelPackager.h                 |   6 +-
 interface/src/ModelPropertiesDialog.cpp       |   4 +-
 interface/src/ModelPropertiesDialog.h         |   4 +-
 interface/src/avatar/MyAvatar.cpp             |  14 +-
 interface/src/avatar/MySkeletonModel.cpp      |   2 +-
 interface/src/raypick/CollisionPick.cpp       |  30 ++--
 interface/src/ui/overlays/ModelOverlay.cpp    |  22 +--
 libraries/animation/src/AnimClip.cpp          |  18 +--
 libraries/animation/src/AnimSkeleton.cpp      |  16 +-
 libraries/animation/src/AnimSkeleton.h        |   8 +-
 libraries/animation/src/AnimationCache.cpp    |  18 +--
 libraries/animation/src/AnimationCache.h      |  12 +-
 libraries/animation/src/AnimationObject.cpp   |   8 +-
 libraries/animation/src/AnimationObject.h     |   4 +-
 libraries/animation/src/Rig.cpp               |  18 +--
 libraries/animation/src/Rig.h                 |  22 +--
 .../src/avatars-renderer/Avatar.cpp           |   6 +-
 .../src/avatars-renderer/SkeletonModel.cpp    |  16 +-
 .../src/avatars-renderer/SkeletonModel.h      |   4 +-
 libraries/baking/src/FBXBaker.cpp             |   6 +-
 libraries/baking/src/FBXBaker.h               |   2 +-
 libraries/baking/src/ModelBaker.cpp           |   2 +-
 libraries/baking/src/ModelBaker.h             |   2 +-
 libraries/baking/src/OBJBaker.cpp             |   8 +-
 libraries/baking/src/OBJBaker.h               |   4 +-
 .../src/RenderableModelEntityItem.cpp         |  66 ++++----
 libraries/fbx/src/FBX.h                       |  90 +++++------
 libraries/fbx/src/FBXReader.cpp               | 150 +++++++++---------
 libraries/fbx/src/FBXReader.h                 |  16 +-
 libraries/fbx/src/FBXReader_Material.cpp      |  40 ++---
 libraries/fbx/src/FBXReader_Mesh.cpp          |  76 ++++-----
 libraries/fbx/src/GLTFReader.cpp              | 112 ++++++-------
 libraries/fbx/src/GLTFReader.h                |  10 +-
 libraries/fbx/src/OBJReader.cpp               |  96 +++++------
 libraries/fbx/src/OBJReader.h                 |  12 +-
 .../src/model-networking/ModelCache.cpp       |  54 +++----
 .../src/model-networking/ModelCache.h         |  14 +-
 .../render-utils/src/CauterizedModel.cpp      |  18 +--
 .../render-utils/src/MeshPartPayload.cpp      |   4 +-
 libraries/render-utils/src/Model.cpp          |  76 ++++-----
 libraries/render-utils/src/Model.h            |   6 +-
 .../render-utils/src/SoftAttachmentModel.cpp  |   6 +-
 scripts/system/commerce/wallet.js             |   8 +-
 scripts/system/marketplaces/marketplaces.js   |  27 +++-
 tests-manual/gpu/src/TestFbx.cpp              |  10 +-
 tests-manual/gpu/src/TestFbx.h                |   2 +-
 .../src/AnimInverseKinematicsTests.cpp        |   8 +-
 tools/skeleton-dump/src/SkeletonDumpApp.cpp   |   4 +-
 tools/vhacd-util/src/VHACDUtil.cpp            |  44 ++---
 tools/vhacd-util/src/VHACDUtil.h              |  12 +-
 tools/vhacd-util/src/VHACDUtilApp.cpp         |  26 +--
 tools/vhacd-util/src/VHACDUtilApp.h           |   2 +-
 58 files changed, 654 insertions(+), 636 deletions(-)

diff --git a/assignment-client/src/avatars/ScriptableAvatar.cpp b/assignment-client/src/avatars/ScriptableAvatar.cpp
index 7d2b267a05..385f94d9f3 100644
--- a/assignment-client/src/avatars/ScriptableAvatar.cpp
+++ b/assignment-client/src/avatars/ScriptableAvatar.cpp
@@ -69,10 +69,10 @@ void ScriptableAvatar::setSkeletonModelURL(const QUrl& skeletonModelURL) {
     AvatarData::setSkeletonModelURL(skeletonModelURL);
 }
 
-static AnimPose composeAnimPose(const FBXJoint& fbxJoint, const glm::quat rotation, const glm::vec3 translation) {
+static AnimPose composeAnimPose(const HFMJoint& joint, const glm::quat rotation, const glm::vec3 translation) {
     glm::mat4 translationMat = glm::translate(translation);
-    glm::mat4 rotationMat = glm::mat4_cast(fbxJoint.preRotation * rotation * fbxJoint.postRotation);
-    glm::mat4 finalMat = translationMat * fbxJoint.preTransform * rotationMat * fbxJoint.postTransform;
+    glm::mat4 rotationMat = glm::mat4_cast(joint.preRotation * rotation * joint.postRotation);
+    glm::mat4 finalMat = translationMat * joint.preTransform * rotationMat * joint.postTransform;
     return AnimPose(finalMat);
 }
 
@@ -93,7 +93,7 @@ void ScriptableAvatar::update(float deltatime) {
             }
             _animationDetails.currentFrame = currentFrame;
 
-            const QVector<FBXJoint>& modelJoints = _bind->getGeometry().joints;
+            const QVector<HFMJoint>& modelJoints = _bind->getGeometry().joints;
             QStringList animationJointNames = _animation->getJointNames();
 
             const int nJoints = modelJoints.size();
@@ -102,8 +102,8 @@ void ScriptableAvatar::update(float deltatime) {
             }
 
             const int frameCount = _animation->getFrames().size();
-            const FBXAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
-            const FBXAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
+            const HFMAnimationFrame& floorFrame = _animation->getFrames().at((int)glm::floor(currentFrame) % frameCount);
+            const HFMAnimationFrame& ceilFrame = _animation->getFrames().at((int)glm::ceil(currentFrame) % frameCount);
             const float frameFraction = glm::fract(currentFrame);
             std::vector<AnimPose> poses = _animSkeleton->getRelativeDefaultPoses();
 
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index db030d2fee..271aab87d1 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -240,11 +240,6 @@ Rectangle {
                     lightboxPopup.button1method = function() {
                         lightboxPopup.visible = false;
                     }
-                    lightboxPopup.button2text = "GO TO WALLET";
-                    lightboxPopup.button2method = function() {
-                        lightboxPopup.visible = false;
-                        sendToScript({method: 'checkout_openWallet'});
-                    };
                     lightboxPopup.visible = true;
                 } else {
                     sendToScript(msg);
@@ -903,7 +898,7 @@ Rectangle {
             horizontalAlignment: Text.AlignLeft;
             verticalAlignment: Text.AlignVCenter;
             onLinkActivated: {
-                sendToScript({method: 'checkout_openWallet'});
+                sendToScript({method: 'checkout_openRecentActivity'});
             }
         }
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 6cf00f78eb..575edfc34d 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -62,7 +62,7 @@ Item {
             isExpanded: false;
             question: "How can I get HFC?";
             answer: "High Fidelity commerce is in open beta right now. Want more HFC? \
-Get it by going to <br><br><b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity.</a></font></b> and meeting with the banker!";
+Get it by going to <b><font color='#0093C5'><a href='#bank'>BankOfHighFidelity</a></font></b> and meeting with the banker!";
         }
         ListElement {
             isExpanded: false;
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index ad472f85f8..1f8490b7c7 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -29,6 +29,7 @@ Rectangle {
     id: root;
 
     property string activeView: "initialize";
+    property string initialActiveViewAfterStatus5: "walletInventory";
     property bool keyboardRaised: false;
     property bool isPassword: false;
 
@@ -66,7 +67,7 @@ Rectangle {
                 }
             } else if (walletStatus === 5) {
                 if (root.activeView !== "walletSetup") {
-                    root.activeView = "walletInventory";
+                    root.activeView = root.initialActiveViewAfterStatus5;
                     Commerce.getAvailableUpdates();
                     Commerce.getSecurityImage();
                 }
@@ -688,15 +689,12 @@ Rectangle {
         function resetTabButtonColors() {
             walletHomeButtonContainer.color = hifi.colors.black;
             sendMoneyButtonContainer.color = hifi.colors.black;
-            securityButtonContainer.color = hifi.colors.black;
             helpButtonContainer.color = hifi.colors.black;
             exchangeMoneyButtonContainer.color = hifi.colors.black;
             if (root.activeView === "walletHome") {
                 walletHomeButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "sendMoney") {
                 sendMoneyButtonContainer.color = hifi.colors.blueAccent;
-            } else if (root.activeView === "security") {
-                securityButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView === "help") {
                 helpButtonContainer.color = hifi.colors.blueAccent;
             } else if (root.activeView == "walletInventory") {
@@ -766,10 +764,12 @@ Rectangle {
             break;
             case 'updateConnections':
                 sendMoney.updateConnections(message.connections);
+                walletInventory.fromScript(message);
             break;
             case 'selectRecipient':
             case 'updateSelectedRecipientUsername':
                 sendMoney.fromScript(message);
+                walletInventory.fromScript(message);
             break;
             case 'http.response':
                 http.handleHttpResponse(message);
@@ -785,15 +785,19 @@ Rectangle {
             break;
             case 'updatePurchases':
             case 'purchases_showMyItems':
-            case 'updateConnections':
-            case 'selectRecipient':
-            case 'updateSelectedRecipientUsername':
             case 'updateWearables':
                 walletInventory.fromScript(message);
             break;
             case 'updateRecentActivityMessageLight':
                 walletHomeButtonContainer.messagesWaiting = message.messagesWaiting;
             break;
+            case 'checkout_openRecentActivity':
+                if (root.activeView === "initialize") {
+                    root.initialActiveViewAfterStatus5 = "walletHome";
+                } else {
+                    root.activeView = "walletHome";
+                }
+            break;
             default:
                 console.log('Unrecognized message from wallet.js:', JSON.stringify(message));
         }
diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 8baff0ac13..96a554838f 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -328,7 +328,7 @@ Rectangle {
 
                 HifiStylesUit.RalewayRegular {
                     text: "Your wallet is not set up.\n" +
-                        "Open the WALLET app to get started.";
+                        "Open the ASSETS app to get started.";
                     // Anchors
                     anchors.fill: parent;
                     // Text size
diff --git a/interface/src/ModelPackager.cpp b/interface/src/ModelPackager.cpp
index 3a5d92eb8c..0b2846006b 100644
--- a/interface/src/ModelPackager.cpp
+++ b/interface/src/ModelPackager.cpp
@@ -235,7 +235,7 @@ bool ModelPackager::zipModel() {
     return true;
 }
 
-void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry) {
+void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry) {
 
     bool isBodyType = _modelType == FSTReader::BODY_ONLY_MODEL || _modelType == FSTReader::HEAD_AND_BODY_MODEL;
 
@@ -370,7 +370,7 @@ void ModelPackager::populateBasicMapping(QVariantHash& mapping, QString filename
 
 void ModelPackager::listTextures() {
     _textures.clear();
-    foreach (const FBXMaterial mat, _geometry->materials) {
+    foreach (const HFMMaterial mat, _geometry->materials) {
         if (!mat.albedoTexture.filename.isEmpty() && mat.albedoTexture.content.isEmpty() &&
             !_textures.contains(mat.albedoTexture.filename)) {
             _textures << mat.albedoTexture.filename;
diff --git a/interface/src/ModelPackager.h b/interface/src/ModelPackager.h
index 76295e5a85..b68d9e746d 100644
--- a/interface/src/ModelPackager.h
+++ b/interface/src/ModelPackager.h
@@ -19,7 +19,7 @@
 
 #include "ui/ModelsBrowser.h"
 
-class FBXGeometry;
+class HFMGeometry;
 
 class ModelPackager : public QObject {
 public:
@@ -32,7 +32,7 @@ private:
     bool editProperties();
     bool zipModel();
     
-    void populateBasicMapping(QVariantHash& mapping, QString filename, const FBXGeometry& geometry);
+    void populateBasicMapping(QVariantHash& mapping, QString filename, const HFMGeometry& geometry);
     
     void listTextures();
     bool copyTextures(const QString& oldDir, const QDir& newDir);
@@ -44,7 +44,7 @@ private:
     QString _scriptDir;
 
     QVariantHash _mapping;
-    std::unique_ptr<FBXGeometry> _geometry;
+    std::unique_ptr<HFMGeometry> _geometry;
     QStringList _textures;
     QStringList _scripts;
 };
diff --git a/interface/src/ModelPropertiesDialog.cpp b/interface/src/ModelPropertiesDialog.cpp
index 8984f89d07..dcda85d117 100644
--- a/interface/src/ModelPropertiesDialog.cpp
+++ b/interface/src/ModelPropertiesDialog.cpp
@@ -27,7 +27,7 @@
 
 
 ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                                             const QString& basePath, const FBXGeometry& geometry) :
+                                             const QString& basePath, const HFMGeometry& geometry) :
 _modelType(modelType),
 _originalMapping(originalMapping),
 _basePath(basePath),
@@ -249,7 +249,7 @@ QComboBox* ModelPropertiesDialog::createJointBox(bool withNone) const {
     if (withNone) {
         box->addItem("(none)");
     }
-    foreach (const FBXJoint& joint, _geometry.joints) {
+    foreach (const HFMJoint& joint, _geometry.joints) {
         if (joint.isSkeletonJoint || !_geometry.hasSkeletonJoints) {
             box->addItem(joint.name);
         }
diff --git a/interface/src/ModelPropertiesDialog.h b/interface/src/ModelPropertiesDialog.h
index e3c2d8ed6a..d1a020bec3 100644
--- a/interface/src/ModelPropertiesDialog.h
+++ b/interface/src/ModelPropertiesDialog.h
@@ -30,7 +30,7 @@ class ModelPropertiesDialog : public QDialog {
     
 public:
     ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
-                          const QString& basePath, const FBXGeometry& geometry);
+                          const QString& basePath, const HFMGeometry& geometry);
     
     QVariantHash getMapping() const;
     
@@ -50,7 +50,7 @@ private:
     FSTReader::ModelType _modelType;
     QVariantHash _originalMapping;
     QString _basePath;
-    FBXGeometry _geometry;
+    HFMGeometry _geometry;
     QLineEdit* _name = nullptr;
     QPushButton* _textureDirectory = nullptr;
     QPushButton* _scriptDirectory = nullptr;
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index 3299bd10e7..b3a66f70b8 100755
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -155,7 +155,7 @@ MyAvatar::MyAvatar(QThread* thread) :
     });
     connect(_skeletonModel.get(), &Model::rigReady, this, [this]() {
         if (_shouldLoadScripts) {
-            auto geometry = getSkeletonModel()->getFBXGeometry();
+            auto geometry = getSkeletonModel()->getHFMGeometry();
             qApp->loadAvatarScripts(geometry.scripts);
             _shouldLoadScripts = false;
         }
@@ -2429,10 +2429,10 @@ void MyAvatar::attachmentDataToEntityProperties(const AttachmentData& data, Enti
 void MyAvatar::initHeadBones() {
     int neckJointIndex = -1;
     if (_skeletonModel->isLoaded()) {
-        neckJointIndex = _skeletonModel->getFBXGeometry().neckJointIndex;
+        neckJointIndex = _skeletonModel->getHFMGeometry().neckJointIndex;
     }
     if (neckJointIndex == -1) {
-        neckJointIndex = (_skeletonModel->getFBXGeometry().headJointIndex - 1);
+        neckJointIndex = (_skeletonModel->getHFMGeometry().headJointIndex - 1);
         if (neckJointIndex < 0) {
             // return if the head is not even there. can't cauterize!!
             return;
@@ -2443,7 +2443,7 @@ void MyAvatar::initHeadBones() {
     q.push(neckJointIndex);
     _headBoneSet.insert(neckJointIndex);
 
-    // fbxJoints only hold links to parents not children, so we have to do a bit of extra work here.
+    // hfmJoints only hold links to parents not children, so we have to do a bit of extra work here.
     while (q.size() > 0) {
         int jointIndex = q.front();
         for (int i = 0; i < _skeletonModel->getJointStateCount(); i++) {
@@ -2592,11 +2592,11 @@ void MyAvatar::postUpdate(float deltaTime, const render::ScenePointer& scene) {
 
         if (_skeletonModel && _skeletonModel->isLoaded()) {
             const Rig& rig = _skeletonModel->getRig();
-            const FBXGeometry& geometry = _skeletonModel->getFBXGeometry();
+            const HFMGeometry& geometry = _skeletonModel->getHFMGeometry();
             for (int i = 0; i < rig.getJointStateCount(); i++) {
                 AnimPose jointPose;
                 rig.getAbsoluteJointPoseInRigFrame(i, jointPose);
-                const FBXJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
+                const HFMJointShapeInfo& shapeInfo = geometry.joints[i].shapeInfo;
                 const AnimPose pose = rigToWorldPose * jointPose;
                 for (size_t j = 0; j < shapeInfo.debugLines.size() / 2; j++) {
                     glm::vec3 pointA = pose.xformPoint(shapeInfo.debugLines[2 * j]);
@@ -4012,7 +4012,7 @@ float MyAvatar::getSitStandStateChange() const {
 }
 
 QVector<QString> MyAvatar::getScriptUrls() {
-    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getFBXGeometry().scripts : QVector<QString>();
+    QVector<QString> scripts = _skeletonModel->isLoaded() ? _skeletonModel->getHFMGeometry().scripts : QVector<QString>();
     return scripts;
 }
 
diff --git a/interface/src/avatar/MySkeletonModel.cpp b/interface/src/avatar/MySkeletonModel.cpp
index c6aae6124a..3ec40d372b 100644
--- a/interface/src/avatar/MySkeletonModel.cpp
+++ b/interface/src/avatar/MySkeletonModel.cpp
@@ -90,7 +90,7 @@ static AnimPose computeHipsInSensorFrame(MyAvatar* myAvatar, bool isFlying) {
 
 // Called within Model::simulate call, below.
 void MySkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     Head* head = _owningAvatar->getHead();
 
diff --git a/interface/src/raypick/CollisionPick.cpp b/interface/src/raypick/CollisionPick.cpp
index 25927c5b68..e8a53aa9b6 100644
--- a/interface/src/raypick/CollisionPick.cpp
+++ b/interface/src/raypick/CollisionPick.cpp
@@ -131,7 +131,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const FBXGeometry& collisionGeometry = resource->getFBXGeometry();
+        const HFMGeometry& collisionGeometry = resource->getHFMGeometry();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -139,15 +139,15 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
 
         // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
         // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
-        foreach (const FBXMesh& mesh, collisionGeometry.meshes) {
+        foreach (const HFMMesh& mesh, collisionGeometry.meshes) {
             // each meshPart is a convex hull
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 pointCollection.push_back(QVector<glm::vec3>());
                 ShapeInfo::PointList& pointsInPart = pointCollection[i];
 
                 // run through all the triangles and (uniquely) add each point to the hull
                 uint32_t numIndices = (uint32_t)meshPart.triangleIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % TRIANGLE_STRIDE == 0);
                 numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -168,7 +168,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
 
                 // run through all the quads and (uniquely) add each point to the hull
                 numIndices = (uint32_t)meshPart.quadIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % QUAD_STRIDE == 0);
                 numIndices -= numIndices % QUAD_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -206,7 +206,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / resource->getFBXGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / resource->getHFMGeometry().getUnscaledMeshExtents().size();
         // multiply each point by scale
         for (int32_t i = 0; i < pointCollection.size(); i++) {
             for (int32_t j = 0; j < pointCollection[i].size(); j++) {
@@ -216,11 +216,11 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
         }
         shapeInfo.setParams(type, dimensions, resource->getURL().toString());
     } else if (type >= SHAPE_TYPE_SIMPLE_HULL && type <= SHAPE_TYPE_STATIC_MESH) {
-        const FBXGeometry& fbxGeometry = resource->getFBXGeometry();
-        int numFbxMeshes = fbxGeometry.meshes.size();
+        const HFMGeometry& hfmGeometry = resource->getHFMGeometry();
+        int numHFMMeshes = hfmGeometry.meshes.size();
         int totalNumVertices = 0;
-        for (int i = 0; i < numFbxMeshes; i++) {
-            const FBXMesh& mesh = fbxGeometry.meshes.at(i);
+        for (int i = 0; i < numHFMMeshes; i++) {
+            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
             totalNumVertices += mesh.vertices.size();
         }
         const int32_t MAX_VERTICES_PER_STATIC_MESH = 1e6;
@@ -230,7 +230,7 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
             return;
         }
 
-        auto& meshes = resource->getFBXGeometry().meshes;
+        auto& meshes = resource->getHFMGeometry().meshes;
         int32_t numMeshes = (int32_t)(meshes.size());
 
         const int MAX_ALLOWED_MESH_COUNT = 1000;
@@ -285,12 +285,12 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
             if (type == SHAPE_TYPE_STATIC_MESH) {
                 // copy into triangleIndices
                 size_t triangleIndicesCount = 0;
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     triangleIndicesCount += meshPart.triangleIndices.count();
                 }
                 triangleIndices.reserve((int)triangleIndicesCount);
 
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     const int* indexItr = meshPart.triangleIndices.cbegin();
                     while (indexItr != meshPart.triangleIndices.cend()) {
                         triangleIndices.push_back(*indexItr);
@@ -299,11 +299,11 @@ void CollisionPick::computeShapeInfo(const CollisionRegion& pick, ShapeInfo& sha
                 }
             } else if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
                 // for each mesh copy unique part indices, separated by special bogus (flag) index values
-                for (const FBXMeshPart& meshPart : mesh.parts) {
+                for (const HFMMeshPart& meshPart : mesh.parts) {
                     // collect unique list of indices for this part
                     std::set<int32_t> uniqueIndices;
                     auto numIndices = meshPart.triangleIndices.count();
-                    // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                    // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                     //assert(numIndices% TRIANGLE_STRIDE == 0);
                     numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
diff --git a/interface/src/ui/overlays/ModelOverlay.cpp b/interface/src/ui/overlays/ModelOverlay.cpp
index eee8222051..1b66ff08ad 100644
--- a/interface/src/ui/overlays/ModelOverlay.cpp
+++ b/interface/src/ui/overlays/ModelOverlay.cpp
@@ -446,7 +446,7 @@ QVariant ModelOverlay::getProperty(const QString& property) {
 
     if (property == "jointNames") {
         if (_model && _model->isActive()) {
-            // note: going through Rig because Model::getJointNames() (which proxies to FBXGeometry) was always empty
+            // note: going through Rig because Model::getJointNames() (which proxies to HFMGeometry) was always empty
             const Rig* rig = &(_model->getRig());
             return mapJoints<QStringList, QString>([rig](int jointIndex) -> QString {
                 return rig->nameOfJoint(jointIndex);
@@ -574,7 +574,7 @@ void ModelOverlay::animate() {
 
     QVector<JointData> jointsData;
 
-    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    const QVector<HFMAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
     int frameCount = frames.size();
     if (frameCount <= 0) {
         return;
@@ -606,10 +606,10 @@ void ModelOverlay::animate() {
     }
 
     QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& fbxJoints = _animation->getGeometry().joints;
+    auto& hfmJoints = _animation->getGeometry().joints;
 
-    auto& originalFbxJoints = _model->getFBXGeometry().joints;
-    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMGeometry().joints;
+    auto& originalFbxIndices = _model->getHFMGeometry().jointIndices;
 
     const QVector<glm::quat>& rotations = frames[_lastKnownCurrentFrame].rotations;
     const QVector<glm::vec3>& translations = frames[_lastKnownCurrentFrame].translations;
@@ -626,23 +626,23 @@ void ModelOverlay::animate() {
                     translationMat = glm::translate(translations[index]);
                 }
             } else if (index < animationJointNames.size()) {
-                QString jointName = fbxJoints[index].name;
+                QString jointName = hfmJoints[index].name;
 
                 if (originalFbxIndices.contains(jointName)) {
                     // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get its translation.
                     int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
-                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                    translationMat = glm::translate(originalHFMJoints[remappedIndex].translation);
                 }
             }
             glm::mat4 rotationMat;
             if (index < rotations.size()) {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * rotations[index] * hfmJoints[index].postRotation);
             } else {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * hfmJoints[index].postRotation);
             }
 
-            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
-                rotationMat * fbxJoints[index].postTransform);
+            glm::mat4 finalMat = (translationMat * hfmJoints[index].preTransform *
+                rotationMat * hfmJoints[index].postTransform);
             auto& jointData = jointsData[j];
             jointData.translation = extractTranslation(finalMat);
             jointData.translationIsDefaultPose = false;
diff --git a/libraries/animation/src/AnimClip.cpp b/libraries/animation/src/AnimClip.cpp
index f9195a608b..d630218165 100644
--- a/libraries/animation/src/AnimClip.cpp
+++ b/libraries/animation/src/AnimClip.cpp
@@ -101,7 +101,7 @@ void AnimClip::copyFromNetworkAnim() {
 
     // build a mapping from animation joint indices to skeleton joint indices.
     // by matching joints with the same name.
-    const FBXGeometry& geom = _networkAnim->getGeometry();
+    const HFMGeometry& geom = _networkAnim->getGeometry();
     AnimSkeleton animSkeleton(geom);
     const auto animJointCount = animSkeleton.getNumJoints();
     const auto skeletonJointCount = _skeleton->getNumJoints();
@@ -120,7 +120,7 @@ void AnimClip::copyFromNetworkAnim() {
 
     for (int frame = 0; frame < frameCount; frame++) {
 
-        const FBXAnimationFrame& fbxAnimFrame = geom.animationFrames[frame];
+        const HFMAnimationFrame& hfmAnimFrame = geom.animationFrames[frame];
 
         // init all joints in animation to default pose
         // this will give us a resonable result for bones in the model skeleton but not in the animation.
@@ -132,8 +132,8 @@ void AnimClip::copyFromNetworkAnim() {
         for (int animJoint = 0; animJoint < animJointCount; animJoint++) {
             int skeletonJoint = jointMap[animJoint];
 
-            const glm::vec3& fbxAnimTrans = fbxAnimFrame.translations[animJoint];
-            const glm::quat& fbxAnimRot = fbxAnimFrame.rotations[animJoint];
+            const glm::vec3& hfmAnimTrans = hfmAnimFrame.translations[animJoint];
+            const glm::quat& hfmAnimRot = hfmAnimFrame.rotations[animJoint];
 
             // skip joints that are in the animation but not in the skeleton.
             if (skeletonJoint >= 0 && skeletonJoint < skeletonJointCount) {
@@ -146,19 +146,19 @@ void AnimClip::copyFromNetworkAnim() {
                 preRot.scale() = glm::vec3(1.0f);
                 postRot.scale() = glm::vec3(1.0f);
 
-                AnimPose rot(glm::vec3(1.0f), fbxAnimRot, glm::vec3());
+                AnimPose rot(glm::vec3(1.0f), hfmAnimRot, glm::vec3());
 
                 // adjust translation offsets, so large translation animatons on the reference skeleton
                 // will be adjusted when played on a skeleton with short limbs.
-                const glm::vec3& fbxZeroTrans = geom.animationFrames[0].translations[animJoint];
+                const glm::vec3& hfmZeroTrans = geom.animationFrames[0].translations[animJoint];
                 const AnimPose& relDefaultPose = _skeleton->getRelativeDefaultPose(skeletonJoint);
                 float boneLengthScale = 1.0f;
                 const float EPSILON = 0.0001f;
-                if (fabsf(glm::length(fbxZeroTrans)) > EPSILON) {
-                    boneLengthScale = glm::length(relDefaultPose.trans()) / glm::length(fbxZeroTrans);
+                if (fabsf(glm::length(hfmZeroTrans)) > EPSILON) {
+                    boneLengthScale = glm::length(relDefaultPose.trans()) / glm::length(hfmZeroTrans);
                 }
 
-                AnimPose trans = AnimPose(glm::vec3(1.0f), glm::quat(), relDefaultPose.trans() + boneLengthScale * (fbxAnimTrans - fbxZeroTrans));
+                AnimPose trans = AnimPose(glm::vec3(1.0f), glm::quat(), relDefaultPose.trans() + boneLengthScale * (hfmAnimTrans - hfmZeroTrans));
 
                 _anim[frame][skeletonJoint] = trans * preRot * rot * postRot;
             }
diff --git a/libraries/animation/src/AnimSkeleton.cpp b/libraries/animation/src/AnimSkeleton.cpp
index bed9c590be..fc4114ac7b 100644
--- a/libraries/animation/src/AnimSkeleton.cpp
+++ b/libraries/animation/src/AnimSkeleton.cpp
@@ -16,17 +16,17 @@
 
 #include "AnimationLogging.h"
 
-AnimSkeleton::AnimSkeleton(const FBXGeometry& fbxGeometry) {
+AnimSkeleton::AnimSkeleton(const HFMGeometry& geometry) {
     // convert to std::vector of joints
-    std::vector<FBXJoint> joints;
-    joints.reserve(fbxGeometry.joints.size());
-    for (auto& joint : fbxGeometry.joints) {
+    std::vector<HFMJoint> joints;
+    joints.reserve(geometry.joints.size());
+    for (auto& joint : geometry.joints) {
         joints.push_back(joint);
     }
     buildSkeletonFromJoints(joints);
 }
 
-AnimSkeleton::AnimSkeleton(const std::vector<FBXJoint>& joints) {
+AnimSkeleton::AnimSkeleton(const std::vector<HFMJoint>& joints) {
     buildSkeletonFromJoints(joints);
 }
 
@@ -166,7 +166,7 @@ void AnimSkeleton::mirrorAbsolutePoses(AnimPoseVec& poses) const {
     }
 }
 
-void AnimSkeleton::buildSkeletonFromJoints(const std::vector<FBXJoint>& joints) {
+void AnimSkeleton::buildSkeletonFromJoints(const std::vector<HFMJoint>& joints) {
     _joints = joints;
     _jointsSize = (int)joints.size();
     // build a cache of bind poses
@@ -177,7 +177,7 @@ void AnimSkeleton::buildSkeletonFromJoints(const std::vector<FBXJoint>& joints)
     _relativePreRotationPoses.reserve(_jointsSize);
     _relativePostRotationPoses.reserve(_jointsSize);
 
-    // iterate over FBXJoints and extract the bind pose information.
+    // iterate over HFMJoints and extract the bind pose information.
     for (int i = 0; i < _jointsSize; i++) {
 
         // build pre and post transforms
@@ -240,7 +240,7 @@ void AnimSkeleton::dump(bool verbose) const {
         qCDebug(animation) << "        absDefaultPose =" << getAbsoluteDefaultPose(i);
         qCDebug(animation) << "        relDefaultPose =" << getRelativeDefaultPose(i);
         if (verbose) {
-            qCDebug(animation) << "        fbxJoint =";
+            qCDebug(animation) << "        hfmJoint =";
             qCDebug(animation) << "            isFree =" << _joints[i].isFree;
             qCDebug(animation) << "            freeLineage =" << _joints[i].freeLineage;
             qCDebug(animation) << "            parentIndex =" << _joints[i].parentIndex;
diff --git a/libraries/animation/src/AnimSkeleton.h b/libraries/animation/src/AnimSkeleton.h
index 2ebf3f4f5d..1717d75985 100644
--- a/libraries/animation/src/AnimSkeleton.h
+++ b/libraries/animation/src/AnimSkeleton.h
@@ -23,8 +23,8 @@ public:
     using Pointer = std::shared_ptr<AnimSkeleton>;
     using ConstPointer = std::shared_ptr<const AnimSkeleton>;
 
-    explicit AnimSkeleton(const FBXGeometry& fbxGeometry);
-    explicit AnimSkeleton(const std::vector<FBXJoint>& joints);
+    explicit AnimSkeleton(const HFMGeometry& geometry);
+    explicit AnimSkeleton(const std::vector<HFMJoint>& joints);
     int nameToJointIndex(const QString& jointName) const;
     const QString& getJointName(int jointIndex) const;
     int getNumJoints() const;
@@ -64,9 +64,9 @@ public:
     std::vector<int> lookUpJointIndices(const std::vector<QString>& jointNames) const;
 
 protected:
-    void buildSkeletonFromJoints(const std::vector<FBXJoint>& joints);
+    void buildSkeletonFromJoints(const std::vector<HFMJoint>& joints);
 
-    std::vector<FBXJoint> _joints;
+    std::vector<HFMJoint> _joints;
     int _jointsSize { 0 };
     AnimPoseVec _relativeDefaultPoses;
     AnimPoseVec _absoluteDefaultPoses;
diff --git a/libraries/animation/src/AnimationCache.cpp b/libraries/animation/src/AnimationCache.cpp
index 04b7952ddb..b5b27c3a24 100644
--- a/libraries/animation/src/AnimationCache.cpp
+++ b/libraries/animation/src/AnimationCache.cpp
@@ -69,7 +69,7 @@ void AnimationReader::run() {
 
         if (urlValid) {
             // Parse the FBX directly from the QNetworkReply
-            FBXGeometry::Pointer fbxgeo;
+            HFMGeometry::Pointer fbxgeo;
             if (_url.path().toLower().endsWith(".fbx")) {
                 fbxgeo.reset(readFBX(_data, QVariantHash(), _url.path()));
             } else {
@@ -100,40 +100,40 @@ QStringList Animation::getJointNames() const {
     }
     QStringList names;
     if (_geometry) {
-        foreach (const FBXJoint& joint, _geometry->joints) {
+        foreach (const HFMJoint& joint, _geometry->joints) {
             names.append(joint.name);
         }
     }
     return names;
 }
 
-QVector<FBXAnimationFrame> Animation::getFrames() const {
+QVector<HFMAnimationFrame> Animation::getFrames() const {
     if (QThread::currentThread() != thread()) {
-        QVector<FBXAnimationFrame> result;
+        QVector<HFMAnimationFrame> result;
         BLOCKING_INVOKE_METHOD(const_cast<Animation*>(this), "getFrames",
-            Q_RETURN_ARG(QVector<FBXAnimationFrame>, result));
+            Q_RETURN_ARG(QVector<HFMAnimationFrame>, result));
         return result;
     }
     if (_geometry) {
         return _geometry->animationFrames;
     } else {
-        return QVector<FBXAnimationFrame>();
+        return QVector<HFMAnimationFrame>();
     }
 }
 
-const QVector<FBXAnimationFrame>& Animation::getFramesReference() const {
+const QVector<HFMAnimationFrame>& Animation::getFramesReference() const {
     return _geometry->animationFrames;
 }
 
 void Animation::downloadFinished(const QByteArray& data) {
     // parse the animation/fbx file on a background thread.
     AnimationReader* animationReader = new AnimationReader(_url, data);
-    connect(animationReader, SIGNAL(onSuccess(FBXGeometry::Pointer)), SLOT(animationParseSuccess(FBXGeometry::Pointer)));
+    connect(animationReader, SIGNAL(onSuccess(HFMGeometry::Pointer)), SLOT(animationParseSuccess(HFMGeometry::Pointer)));
     connect(animationReader, SIGNAL(onError(int, QString)), SLOT(animationParseError(int, QString)));
     QThreadPool::globalInstance()->start(animationReader);
 }
 
-void Animation::animationParseSuccess(FBXGeometry::Pointer geometry) {
+void Animation::animationParseSuccess(HFMGeometry::Pointer geometry) {
 
     qCDebug(animation) << "Animation parse success" << _url.toDisplayString();
 
diff --git a/libraries/animation/src/AnimationCache.h b/libraries/animation/src/AnimationCache.h
index 483350e2b5..302f23a4e7 100644
--- a/libraries/animation/src/AnimationCache.h
+++ b/libraries/animation/src/AnimationCache.h
@@ -66,7 +66,7 @@ public:
 
     QString getType() const override { return "Animation"; }
 
-    const FBXGeometry& getGeometry() const { return *_geometry; }
+    const HFMGeometry& getGeometry() const { return *_geometry; }
 
     virtual bool isLoaded() const override;
 
@@ -80,20 +80,20 @@ public:
      * @function AnimationObject.getFrames
      * @returns {FBXAnimationFrame[]}
      */
-    Q_INVOKABLE QVector<FBXAnimationFrame> getFrames() const;
+    Q_INVOKABLE QVector<HFMAnimationFrame> getFrames() const;
 
-    const QVector<FBXAnimationFrame>& getFramesReference() const;
+    const QVector<HFMAnimationFrame>& getFramesReference() const;
     
 protected:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected slots:
-    void animationParseSuccess(FBXGeometry::Pointer geometry);
+    void animationParseSuccess(HFMGeometry::Pointer geometry);
     void animationParseError(int error, QString str);
 
 private:
     
-    FBXGeometry::Pointer _geometry;
+    HFMGeometry::Pointer _geometry;
 };
 
 /// Reads geometry in a worker thread.
@@ -105,7 +105,7 @@ public:
     virtual void run() override;
 
 signals:
-    void onSuccess(FBXGeometry::Pointer geometry);
+    void onSuccess(HFMGeometry::Pointer geometry);
     void onError(int error, QString str);
 
 private:
diff --git a/libraries/animation/src/AnimationObject.cpp b/libraries/animation/src/AnimationObject.cpp
index 7f0f35b104..bcbf497199 100644
--- a/libraries/animation/src/AnimationObject.cpp
+++ b/libraries/animation/src/AnimationObject.cpp
@@ -19,17 +19,17 @@ QStringList AnimationObject::getJointNames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getJointNames();
 }
 
-QVector<FBXAnimationFrame> AnimationObject::getFrames() const {
+QVector<HFMAnimationFrame> AnimationObject::getFrames() const {
     return qscriptvalue_cast<AnimationPointer>(thisObject())->getFrames();
 }
 
 QVector<glm::quat> AnimationFrameObject::getRotations() const {
-    return qscriptvalue_cast<FBXAnimationFrame>(thisObject()).rotations;
+    return qscriptvalue_cast<HFMAnimationFrame>(thisObject()).rotations;
 }
 
 void registerAnimationTypes(QScriptEngine* engine) {
-    qScriptRegisterSequenceMetaType<QVector<FBXAnimationFrame> >(engine);
-    engine->setDefaultPrototype(qMetaTypeId<FBXAnimationFrame>(), engine->newQObject(
+    qScriptRegisterSequenceMetaType<QVector<HFMAnimationFrame> >(engine);
+    engine->setDefaultPrototype(qMetaTypeId<HFMAnimationFrame>(), engine->newQObject(
         new AnimationFrameObject(), QScriptEngine::ScriptOwnership));
     engine->setDefaultPrototype(qMetaTypeId<AnimationPointer>(), engine->newQObject(
         new AnimationObject(), QScriptEngine::ScriptOwnership));
diff --git a/libraries/animation/src/AnimationObject.h b/libraries/animation/src/AnimationObject.h
index aa69e78ceb..83880ed2ab 100644
--- a/libraries/animation/src/AnimationObject.h
+++ b/libraries/animation/src/AnimationObject.h
@@ -23,13 +23,13 @@ class QScriptEngine;
 class AnimationObject : public QObject, protected QScriptable {
     Q_OBJECT
     Q_PROPERTY(QStringList jointNames READ getJointNames)
-    Q_PROPERTY(QVector<FBXAnimationFrame> frames READ getFrames)
+    Q_PROPERTY(QVector<HFMAnimationFrame> frames READ getFrames)
 
 public:
     
     Q_INVOKABLE QStringList getJointNames() const;
     
-    Q_INVOKABLE QVector<FBXAnimationFrame> getFrames() const;
+    Q_INVOKABLE QVector<HFMAnimationFrame> getFrames() const;
 };
 
 /// Scriptable wrapper for animation frames.
diff --git a/libraries/animation/src/Rig.cpp b/libraries/animation/src/Rig.cpp
index 33b9569758..2641be92da 100644
--- a/libraries/animation/src/Rig.cpp
+++ b/libraries/animation/src/Rig.cpp
@@ -260,7 +260,7 @@ void Rig::destroyAnimGraph() {
     _rightEyeJointChildren.clear();
 }
 
-void Rig::initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset) {
+void Rig::initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset) {
     _geometryOffset = AnimPose(geometry.offset);
     _invGeometryOffset = _geometryOffset.inverse();
     _geometryToRigTransform = modelOffset * geometry.offset;
@@ -307,7 +307,7 @@ void Rig::initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOff
     _rightEyeJointChildren = _animSkeleton->getChildrenOfJoint(geometry.rightEyeJointIndex);
 }
 
-void Rig::reset(const FBXGeometry& geometry) {
+void Rig::reset(const HFMGeometry& geometry) {
     _geometryOffset = AnimPose(geometry.offset);
     _invGeometryOffset = _geometryOffset.inverse();
     _animSkeleton = std::make_shared<AnimSkeleton>(geometry);
@@ -1253,7 +1253,7 @@ const glm::vec3 DOP14_NORMALS[DOP14_COUNT] = {
 // returns true if the given point lies inside of the k-dop, specified by shapeInfo & shapePose.
 // if the given point does lie within the k-dop, it also returns the amount of displacement necessary to push that point outward
 // such that it lies on the surface of the kdop.
-static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const FBXJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
+static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& shapePose, const HFMJointShapeInfo& shapeInfo, glm::vec3& displacementOut) {
 
     // transform point into local space of jointShape.
     glm::vec3 localPoint = shapePose.inverse().xformPoint(point);
@@ -1299,8 +1299,8 @@ static bool findPointKDopDisplacement(const glm::vec3& point, const AnimPose& sh
     }
 }
 
-glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                                    const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const {
+glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                                    const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo) const {
     glm::vec3 position = handPosition;
     glm::vec3 displacement;
     int hipsJoint = indexOfJoint("Hips");
@@ -1349,8 +1349,8 @@ glm::vec3 Rig::deflectHandFromTorso(const glm::vec3& handPosition, const FBXJoin
 void Rig::updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
                       bool leftArmEnabled, bool rightArmEnabled, bool headEnabled, float dt,
                       const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                      const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                      const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo,
+                      const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                      const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo,
                       const glm::mat4& rigToSensorMatrix, const glm::mat4& sensorToRigMatrix) {
 
     const bool ENABLE_POLE_VECTORS = true;
@@ -2008,7 +2008,7 @@ void Rig::computeExternalPoses(const glm::mat4& modelOffsetMat) {
 }
 
 void Rig::computeAvatarBoundingCapsule(
-        const FBXGeometry& geometry,
+        const HFMGeometry& geometry,
         float& radiusOut,
         float& heightOut,
         glm::vec3& localOffsetOut) const {
@@ -2041,7 +2041,7 @@ void Rig::computeAvatarBoundingCapsule(
     // from the head to the hips when computing the rest of the bounding capsule.
     int index = indexOfJoint("Head");
     while (index != -1) {
-        const FBXJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
+        const HFMJointShapeInfo& shapeInfo = geometry.joints.at(index).shapeInfo;
         AnimPose pose = _animSkeleton->getAbsoluteDefaultPose(index);
         if (shapeInfo.points.size() > 0) {
             for (auto& point : shapeInfo.points) {
diff --git a/libraries/animation/src/Rig.h b/libraries/animation/src/Rig.h
index 7a090bd7bd..61e8672972 100644
--- a/libraries/animation/src/Rig.h
+++ b/libraries/animation/src/Rig.h
@@ -86,10 +86,10 @@ public:
         AnimPose secondaryControllerPoses[NumSecondaryControllerTypes];  // rig space
         uint8_t secondaryControllerFlags[NumSecondaryControllerTypes];
         bool isTalking;
-        FBXJointShapeInfo hipsShapeInfo;
-        FBXJointShapeInfo spineShapeInfo;
-        FBXJointShapeInfo spine1ShapeInfo;
-        FBXJointShapeInfo spine2ShapeInfo;
+        HFMJointShapeInfo hipsShapeInfo;
+        HFMJointShapeInfo spineShapeInfo;
+        HFMJointShapeInfo spine1ShapeInfo;
+        HFMJointShapeInfo spine2ShapeInfo;
     };
 
     struct EyeParameters {
@@ -122,8 +122,8 @@ public:
     void overrideRoleAnimation(const QString& role, const QString& url, float fps, bool loop, float firstFrame, float lastFrame);
     void restoreRoleAnimation(const QString& role);
 
-    void initJointStates(const FBXGeometry& geometry, const glm::mat4& modelOffset);
-    void reset(const FBXGeometry& geometry);
+    void initJointStates(const HFMGeometry& geometry, const glm::mat4& modelOffset);
+    void reset(const HFMGeometry& geometry);
     bool jointStatesEmpty();
     int getJointStateCount() const;
     int indexOfJoint(const QString& jointName) const;
@@ -210,7 +210,7 @@ public:
     void copyJointsFromJointData(const QVector<JointData>& jointDataVec);
     void computeExternalPoses(const glm::mat4& modelOffsetMat);
 
-    void computeAvatarBoundingCapsule(const FBXGeometry& geometry, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
+    void computeAvatarBoundingCapsule(const HFMGeometry& geometry, float& radiusOut, float& heightOut, glm::vec3& offsetOut) const;
 
     void setEnableInverseKinematics(bool enable);
     void setEnableAnimations(bool enable);
@@ -245,8 +245,8 @@ protected:
     void updateHands(bool leftHandEnabled, bool rightHandEnabled, bool hipsEnabled, bool hipsEstimated,
                      bool leftArmEnabled, bool rightArmEnabled, bool headEnabled, float dt,
                      const AnimPose& leftHandPose, const AnimPose& rightHandPose,
-                     const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                     const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo,
+                     const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                     const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo,
                      const glm::mat4& rigToSensorMatrix, const glm::mat4& sensorToRigMatrix);
     void updateFeet(bool leftFootEnabled, bool rightFootEnabled, bool headEnabled,
                     const AnimPose& leftFootPose, const AnimPose& rightFootPose,
@@ -257,8 +257,8 @@ protected:
 
     bool calculateElbowPoleVector(int handIndex, int elbowIndex, int armIndex, int oppositeArmIndex, glm::vec3& poleVector) const;
     glm::vec3 calculateKneePoleVector(int footJointIndex, int kneeJoint, int upLegIndex, int hipsIndex, const AnimPose& targetFootPose) const;
-    glm::vec3 deflectHandFromTorso(const glm::vec3& handPosition, const FBXJointShapeInfo& hipsShapeInfo, const FBXJointShapeInfo& spineShapeInfo,
-                                   const FBXJointShapeInfo& spine1ShapeInfo, const FBXJointShapeInfo& spine2ShapeInfo) const;
+    glm::vec3 deflectHandFromTorso(const glm::vec3& handPosition, const HFMJointShapeInfo& hipsShapeInfo, const HFMJointShapeInfo& spineShapeInfo,
+                                   const HFMJointShapeInfo& spine1ShapeInfo, const HFMJointShapeInfo& spine2ShapeInfo) const;
 
 
     AnimPose _modelOffset;  // model to rig space
diff --git a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
index 06dd498af3..7c7c113d31 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/Avatar.cpp
@@ -1311,7 +1311,7 @@ glm::quat Avatar::getAbsoluteJointRotationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::quat rotation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointRotationInRigFrame(headJointIndex, rotation);
                 }
@@ -1360,7 +1360,7 @@ glm::vec3 Avatar::getAbsoluteJointTranslationInObjectFrame(int index) const {
         case CAMERA_MATRIX_INDEX: {
             glm::vec3 translation;
             if (_skeletonModel && _skeletonModel->isActive()) {
-                int headJointIndex = _skeletonModel->getFBXGeometry().headJointIndex;
+                int headJointIndex = _skeletonModel->getHFMGeometry().headJointIndex;
                 if (headJointIndex >= 0) {
                     _skeletonModel->getAbsoluteJointTranslationInRigFrame(headJointIndex, translation);
                 }
@@ -1416,7 +1416,7 @@ void Avatar::withValidJointIndicesCache(std::function<void()> const& worker) con
             if (!_modelJointsCached) {
                 _modelJointIndicesCache.clear();
                 if (_skeletonModel && _skeletonModel->isActive()) {
-                    _modelJointIndicesCache = _skeletonModel->getFBXGeometry().jointIndices;
+                    _modelJointIndicesCache = _skeletonModel->getHFMGeometry().jointIndices;
                     _modelJointsCached = true;
                 }
             }
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
index 1ec58fd704..a41cff528b 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.cpp
@@ -54,7 +54,7 @@ void SkeletonModel::setTextures(const QVariantMap& textures) {
 }
 
 void SkeletonModel::initJointStates() {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
     _rig.initJointStates(geometry, modelOffset);
 
@@ -96,7 +96,7 @@ void SkeletonModel::initJointStates() {
 // Called within Model::simulate call, below.
 void SkeletonModel::updateRig(float deltaTime, glm::mat4 parentTransform) {
     assert(!_owningAvatar->isMyAvatar());
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     Head* head = _owningAvatar->getHead();
 
@@ -259,22 +259,22 @@ bool SkeletonModel::getRightShoulderPosition(glm::vec3& position) const {
 }
 
 bool SkeletonModel::getHeadPosition(glm::vec3& headPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getFBXGeometry().headJointIndex, headPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().headJointIndex, headPosition);
 }
 
 bool SkeletonModel::getNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPositionInWorldFrame(getFBXGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPositionInWorldFrame(getHFMGeometry().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getLocalNeckPosition(glm::vec3& neckPosition) const {
-    return isActive() && getJointPosition(getFBXGeometry().neckJointIndex, neckPosition);
+    return isActive() && getJointPosition(getHFMGeometry().neckJointIndex, neckPosition);
 }
 
 bool SkeletonModel::getEyeModelPositions(glm::vec3& firstEyePosition, glm::vec3& secondEyePosition) const {
     if (!isActive()) {
         return false;
     }
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     if (getJointPosition(geometry.leftEyeJointIndex, firstEyePosition) &&
         getJointPosition(geometry.rightEyeJointIndex, secondEyePosition)) {
@@ -330,7 +330,7 @@ void SkeletonModel::computeBoundingShape() {
         return;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     if (geometry.joints.isEmpty() || geometry.rootJointIndex == -1) {
         // rootJointIndex == -1 if the avatar model has no skeleton
         return;
@@ -369,7 +369,7 @@ void SkeletonModel::renderBoundingCollisionShapes(RenderArgs* args, gpu::Batch&
 }
 
 bool SkeletonModel::hasSkeleton() {
-    return isActive() ? getFBXGeometry().rootJointIndex != -1 : false;
+    return isActive() ? getHFMGeometry().rootJointIndex != -1 : false;
 }
 
 void SkeletonModel::onInvalidate() {
diff --git a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
index d82fce7412..6c533a5941 100644
--- a/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
+++ b/libraries/avatars-renderer/src/avatars-renderer/SkeletonModel.h
@@ -41,10 +41,10 @@ public:
     void updateAttitude(const glm::quat& orientation);
 
     /// Returns the index of the left hand joint, or -1 if not found.
-    int getLeftHandJointIndex() const { return isActive() ? getFBXGeometry().leftHandJointIndex : -1; }
+    int getLeftHandJointIndex() const { return isActive() ? getHFMGeometry().leftHandJointIndex : -1; }
 
     /// Returns the index of the right hand joint, or -1 if not found.
-    int getRightHandJointIndex() const { return isActive() ? getFBXGeometry().rightHandJointIndex : -1; }
+    int getRightHandJointIndex() const { return isActive() ? getHFMGeometry().rightHandJointIndex : -1; }
 
     bool getLeftGrabPosition(glm::vec3& position) const;
     bool getRightGrabPosition(glm::vec3& position) const;
diff --git a/libraries/baking/src/FBXBaker.cpp b/libraries/baking/src/FBXBaker.cpp
index b90082d969..0b76c275d4 100644
--- a/libraries/baking/src/FBXBaker.cpp
+++ b/libraries/baking/src/FBXBaker.cpp
@@ -206,7 +206,7 @@ void FBXBaker::importScene() {
     }
 #endif
 
-    _geometry = reader.extractFBXGeometry({}, _modelURL.toString());
+    _geometry = reader.extractHFMGeometry({}, _modelURL.toString());
     _textureContentMap = reader._textureContent;
 }
 
@@ -329,7 +329,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                     for (FBXNode& textureChild : object->children) {
 
                         if (textureChild.name == "RelativeFilename") {
-                            QString fbxTextureFileName { textureChild.properties.at(0).toString() };
+                            QString hfmTextureFileName { textureChild.properties.at(0).toString() };
                             
                             // grab the ID for this texture so we can figure out the
                             // texture type from the loaded materials
@@ -337,7 +337,7 @@ void FBXBaker::rewriteAndBakeSceneTextures() {
                             auto textureType = textureTypes[textureID];
 
                             // Compress the texture information and return the new filename to be added into the FBX scene
-                            auto bakedTextureFile = compressTexture(fbxTextureFileName, textureType);
+                            auto bakedTextureFile = compressTexture(hfmTextureFileName, textureType);
 
                             // If no errors or warnings have occurred during texture compression add the filename to the FBX scene
                             if (!bakedTextureFile.isNull()) {
diff --git a/libraries/baking/src/FBXBaker.h b/libraries/baking/src/FBXBaker.h
index 9d41209d4c..8edaf91c79 100644
--- a/libraries/baking/src/FBXBaker.h
+++ b/libraries/baking/src/FBXBaker.h
@@ -53,7 +53,7 @@ private:
     void rewriteAndBakeSceneModels();
     void rewriteAndBakeSceneTextures();
 
-    FBXGeometry* _geometry;
+    HFMGeometry* _geometry;
     QHash<QString, int> _textureNameMatchCount;
     QHash<QUrl, QString> _remappedTexturePaths;
 
diff --git a/libraries/baking/src/ModelBaker.cpp b/libraries/baking/src/ModelBaker.cpp
index 75e10c54ab..ca352cebae 100644
--- a/libraries/baking/src/ModelBaker.cpp
+++ b/libraries/baking/src/ModelBaker.cpp
@@ -75,7 +75,7 @@ void ModelBaker::abort() {
     }
 }
 
-bool ModelBaker::compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback) {
+bool ModelBaker::compressMesh(HFMMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback) {
     if (mesh.wasCompressed) {
         handleError("Cannot re-bake a file that contains compressed mesh");
         return false;
diff --git a/libraries/baking/src/ModelBaker.h b/libraries/baking/src/ModelBaker.h
index 1fd77ab761..cda4478b1d 100644
--- a/libraries/baking/src/ModelBaker.h
+++ b/libraries/baking/src/ModelBaker.h
@@ -39,7 +39,7 @@ public:
                const QString& bakedOutputDirectory, const QString& originalOutputDirectory = "");
     virtual ~ModelBaker();
 
-    bool compressMesh(FBXMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback = nullptr);
+    bool compressMesh(HFMMesh& mesh, bool hasDeformers, FBXNode& dracoMeshNode, GetMaterialIDCallback materialIDCallback = nullptr);
     QString compressTexture(QString textureFileName, image::TextureUsage::Type = image::TextureUsage::Type::DEFAULT_TEXTURE);
     virtual void setWasAborted(bool wasAborted) override;
 
diff --git a/libraries/baking/src/OBJBaker.cpp b/libraries/baking/src/OBJBaker.cpp
index cf62bc4fa8..e9130e3fbd 100644
--- a/libraries/baking/src/OBJBaker.cpp
+++ b/libraries/baking/src/OBJBaker.cpp
@@ -153,7 +153,7 @@ void OBJBaker::bakeOBJ() {
     checkIfTexturesFinished();
 }
 
-void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
+void OBJBaker::createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry) {
     // Generating FBX Header Node
     FBXNode headerNode;
     headerNode.name = FBX_HEADER_EXTENSION;
@@ -235,7 +235,7 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
     auto size = meshParts.size();
     for (int i = 0; i < size; i++) {
         QString material = meshParts[i].materialID;
-        FBXMaterial currentMaterial = geometry.materials[material];
+        HFMMaterial currentMaterial = geometry.materials[material];
         if (!currentMaterial.albedoTexture.filename.isEmpty() || !currentMaterial.specularTexture.filename.isEmpty()) {
             auto textureID = nextNodeID();
             _mapTextureMaterial.emplace_back(textureID, i);
@@ -325,12 +325,12 @@ void OBJBaker::createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry) {
 }
 
 // Set properties for material nodes
-void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, FBXGeometry& geometry) {
+void OBJBaker::setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry) {
     auto materialID = nextNodeID();
     _materialIDs.push_back(materialID);
     materialNode.properties = { materialID, material, MESH };
 
-    FBXMaterial currentMaterial = geometry.materials[material];
+    HFMMaterial currentMaterial = geometry.materials[material];
 
     // Setting the hierarchy: Material -> Properties70 -> P -> Properties
     FBXNode properties70Node;
diff --git a/libraries/baking/src/OBJBaker.h b/libraries/baking/src/OBJBaker.h
index 8e49692d35..875a500129 100644
--- a/libraries/baking/src/OBJBaker.h
+++ b/libraries/baking/src/OBJBaker.h
@@ -39,8 +39,8 @@ private slots:
 
 private:
     void loadOBJ();
-    void createFBXNodeTree(FBXNode& rootNode, FBXGeometry& geometry);
-    void setMaterialNodeProperties(FBXNode& materialNode, QString material, FBXGeometry& geometry);
+    void createFBXNodeTree(FBXNode& rootNode, HFMGeometry& geometry);
+    void setMaterialNodeProperties(FBXNode& materialNode, QString material, HFMGeometry& geometry);
     NodeID nextNodeID() { return _nodeID++; }
 
 
diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
index c6337dc872..c36f60600f 100644
--- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp
@@ -268,7 +268,7 @@ EntityItemProperties RenderableModelEntityItem::getProperties(const EntityProper
         if (model->isLoaded()) {
             // TODO: improve naturalDimensions in the future,
             //       for now we've added this hack for setting natural dimensions of models
-            Extents meshExtents = model->getFBXGeometry().getUnscaledMeshExtents();
+            Extents meshExtents = model->getHFMGeometry().getUnscaledMeshExtents();
             properties.setNaturalDimensions(meshExtents.maximum - meshExtents.minimum);
             properties.calculateNaturalPosition(meshExtents.minimum, meshExtents.maximum);
         }
@@ -403,7 +403,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // should never fall in here when collision model not fully loaded
         // TODO: assert that all geometries exist and are loaded
         //assert(_model && _model->isLoaded() && _compoundShapeResource && _compoundShapeResource->isLoaded());
-        const FBXGeometry& collisionGeometry = _compoundShapeResource->getFBXGeometry();
+        const HFMGeometry& collisionGeometry = _compoundShapeResource->getHFMGeometry();
 
         ShapeInfo::PointCollection& pointCollection = shapeInfo.getPointCollection();
         pointCollection.clear();
@@ -411,15 +411,15 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         // the way OBJ files get read, each section under a "g" line is its own meshPart.  We only expect
         // to find one actual "mesh" (with one or more meshParts in it), but we loop over the meshes, just in case.
-        foreach (const FBXMesh& mesh, collisionGeometry.meshes) {
+        foreach (const HFMMesh& mesh, collisionGeometry.meshes) {
             // each meshPart is a convex hull
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 pointCollection.push_back(QVector<glm::vec3>());
                 ShapeInfo::PointList& pointsInPart = pointCollection[i];
 
                 // run through all the triangles and (uniquely) add each point to the hull
                 uint32_t numIndices = (uint32_t)meshPart.triangleIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % TRIANGLE_STRIDE == 0);
                 numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -440,7 +440,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
                 // run through all the quads and (uniquely) add each point to the hull
                 numIndices = (uint32_t)meshPart.quadIndices.size();
-                // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                 //assert(numIndices % QUAD_STRIDE == 0);
                 numIndices -= numIndices % QUAD_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -478,7 +478,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
         // to the visual model and apply them to the collision model (without regard for the
         // collision model's extents).
 
-        glm::vec3 scaleToFit = dimensions / model->getFBXGeometry().getUnscaledMeshExtents().size();
+        glm::vec3 scaleToFit = dimensions / model->getHFMGeometry().getUnscaledMeshExtents().size();
         // multiply each point by scale before handing the point-set off to the physics engine.
         // also determine the extents of the collision model.
         glm::vec3 registrationOffset = dimensions * (ENTITY_ITEM_DEFAULT_REGISTRATION_POINT - getRegistrationPoint());
@@ -498,14 +498,14 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         // compute meshPart local transforms
         QVector<glm::mat4> localTransforms;
-        const FBXGeometry& fbxGeometry = model->getFBXGeometry();
-        int numFbxMeshes = fbxGeometry.meshes.size();
+        const HFMGeometry& hfmGeometry = model->getHFMGeometry();
+        int numHFMMeshes = hfmGeometry.meshes.size();
         int totalNumVertices = 0;
         glm::mat4 invRegistraionOffset = glm::translate(dimensions * (getRegistrationPoint() - ENTITY_ITEM_DEFAULT_REGISTRATION_POINT));
-        for (int i = 0; i < numFbxMeshes; i++) {
-            const FBXMesh& mesh = fbxGeometry.meshes.at(i);
+        for (int i = 0; i < numHFMMeshes; i++) {
+            const HFMMesh& mesh = hfmGeometry.meshes.at(i);
             if (mesh.clusters.size() > 0) {
-                const FBXCluster& cluster = mesh.clusters.at(0);
+                const HFMCluster& cluster = mesh.clusters.at(0);
                 auto jointMatrix = model->getRig().getJointTransform(cluster.jointIndex);
                 // we backtranslate by the registration offset so we can apply that offset to the shapeInfo later
                 localTransforms.push_back(invRegistraionOffset * jointMatrix * cluster.inverseBindMatrix);
@@ -524,10 +524,10 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
 
         std::vector<std::shared_ptr<const graphics::Mesh>> meshes;
         if (type == SHAPE_TYPE_SIMPLE_COMPOUND) {
-            auto& fbxMeshes = _compoundShapeResource->getFBXGeometry().meshes;
-            meshes.reserve(fbxMeshes.size());
-            for (auto& fbxMesh : fbxMeshes) {
-                meshes.push_back(fbxMesh._mesh);
+            auto& hfmMeshes = _compoundShapeResource->getHFMGeometry().meshes;
+            meshes.reserve(hfmMeshes.size());
+            for (auto& hfmMesh : hfmMeshes) {
+                meshes.push_back(hfmMesh._mesh);
             }
         } else {
             meshes = model->getGeometry()->getMeshes();
@@ -594,7 +594,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                 while (partItr != parts.cend<const graphics::Mesh::Part>()) {
                     auto numIndices = partItr->_numIndices;
                     if (partItr->_topology == graphics::Mesh::TRIANGLES) {
-                        // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                        // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                         //assert(numIndices % TRIANGLE_STRIDE == 0);
                         numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -605,7 +605,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                             ++indexItr;
                         }
                     } else if (partItr->_topology == graphics::Mesh::TRIANGLE_STRIP) {
-                        // TODO: resurrect assert after we start sanitizing FBXMesh higher up
+                        // TODO: resurrect assert after we start sanitizing HFMMesh higher up
                         //assert(numIndices > 2);
 
                         uint32_t approxNumIndices = TRIANGLE_STRIDE * numIndices;
@@ -651,7 +651,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                     std::set<int32_t> uniqueIndices;
                     auto numIndices = partItr->_numIndices;
                     if (partItr->_topology == graphics::Mesh::TRIANGLES) {
-                        // TODO: assert rather than workaround after we start sanitizing FBXMesh higher up
+                        // TODO: assert rather than workaround after we start sanitizing HFMMesh higher up
                         //assert(numIndices% TRIANGLE_STRIDE == 0);
                         numIndices -= numIndices % TRIANGLE_STRIDE; // WORKAROUND lack of sanity checking in FBXReader
 
@@ -662,7 +662,7 @@ void RenderableModelEntityItem::computeShapeInfo(ShapeInfo& shapeInfo) {
                             ++indexItr;
                         }
                     } else if (partItr->_topology == graphics::Mesh::TRIANGLE_STRIP) {
-                        // TODO: resurrect assert after we start sanitizing FBXMesh higher up
+                        // TODO: resurrect assert after we start sanitizing HFMMesh higher up
                         //assert(numIndices > TRIANGLE_STRIDE - 1);
 
                         auto indexItr = indices.cbegin<const gpu::BufferView::Index>() + partItr->_startIndex;
@@ -755,7 +755,7 @@ int RenderableModelEntityItem::avatarJointIndex(int modelJointIndex) {
 bool RenderableModelEntityItem::contains(const glm::vec3& point) const {
     auto model = getModel();
     if (EntityItem::contains(point) && model && _compoundShapeResource && _compoundShapeResource->isLoaded()) {
-        return _compoundShapeResource->getFBXGeometry().convexHullContains(worldToEntity(point));
+        return _compoundShapeResource->getHFMGeometry().convexHullContains(worldToEntity(point));
     }
 
     return false;
@@ -1135,7 +1135,7 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
 
     QVector<EntityJointData> jointsData;
 
-    const QVector<FBXAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
+    const QVector<HFMAnimationFrame>&  frames = _animation->getFramesReference(); // NOTE: getFrames() is too heavy
     int frameCount = frames.size();
     if (frameCount <= 0) {
         return;
@@ -1160,10 +1160,10 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
     }
 
     QStringList animationJointNames = _animation->getGeometry().getJointNames();
-    auto& fbxJoints = _animation->getGeometry().joints;
+    auto& hfmJoints = _animation->getGeometry().joints;
 
-    auto& originalFbxJoints = _model->getFBXGeometry().joints;
-    auto& originalFbxIndices = _model->getFBXGeometry().jointIndices;
+    auto& originalHFMJoints = _model->getHFMGeometry().joints;
+    auto& originalHFMIndices = _model->getHFMGeometry().jointIndices;
 
     bool allowTranslation = entity->getAnimationAllowTranslation();
 
@@ -1182,22 +1182,22 @@ void ModelEntityRenderer::animate(const TypedEntityPointer& entity) {
                     translationMat = glm::translate(translations[index]);
                 }
             } else if (index < animationJointNames.size()) {
-                QString jointName = fbxJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
-                if (originalFbxIndices.contains(jointName)) {
+                QString jointName = hfmJoints[index].name; // Pushing this here so its not done on every entity, with the exceptions of those allowing for translation
+                if (originalHFMIndices.contains(jointName)) {
                     // Making sure the joint names exist in the original model the animation is trying to apply onto. If they do, then remap and get it's translation.
-                    int remappedIndex = originalFbxIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
-                    translationMat = glm::translate(originalFbxJoints[remappedIndex].translation);
+                    int remappedIndex = originalHFMIndices[jointName] - 1; // JointIndeces seem to always start from 1 and the found index is always 1 higher than actual.
+                    translationMat = glm::translate(originalHFMJoints[remappedIndex].translation);
                 }
             }
             glm::mat4 rotationMat;
             if (index < rotations.size()) {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * rotations[index] * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * rotations[index] * hfmJoints[index].postRotation);
             } else {
-                rotationMat = glm::mat4_cast(fbxJoints[index].preRotation * fbxJoints[index].postRotation);
+                rotationMat = glm::mat4_cast(hfmJoints[index].preRotation * hfmJoints[index].postRotation);
             }
 
-            glm::mat4 finalMat = (translationMat * fbxJoints[index].preTransform *
-                rotationMat * fbxJoints[index].postTransform);
+            glm::mat4 finalMat = (translationMat * hfmJoints[index].preTransform *
+                rotationMat * hfmJoints[index].postTransform);
             auto& jointData = jointsData[j];
             jointData.translation = extractTranslation(finalMat);
             jointData.translationSet = true;
diff --git a/libraries/fbx/src/FBX.h b/libraries/fbx/src/FBX.h
index fdebb16bc8..8051dbafea 100644
--- a/libraries/fbx/src/FBX.h
+++ b/libraries/fbx/src/FBX.h
@@ -70,8 +70,8 @@ public:
 };
 
 
-/// A single blendshape extracted from an FBX document.
-class FBXBlendshape {
+/// A single blendshape.
+class HFMBlendshape {
 public:
     QVector<int> indices;
     QVector<glm::vec3> vertices;
@@ -79,19 +79,19 @@ public:
     QVector<glm::vec3> tangents;
 };
 
-struct FBXJointShapeInfo {
-    // same units and frame as FBXJoint.translation
+struct HFMJointShapeInfo {
+    // same units and frame as HFMJoint.translation
     glm::vec3 avgPoint;
     std::vector<float> dots;
     std::vector<glm::vec3> points;
     std::vector<glm::vec3> debugLines;
 };
 
-/// A single joint (transformation node) extracted from an FBX document.
-class FBXJoint {
+/// A single joint (transformation node).
+class HFMJoint {
 public:
 
-    FBXJointShapeInfo shapeInfo;
+    HFMJointShapeInfo shapeInfo;
     QVector<int> freeLineage;
     bool isFree;
     int parentIndex;
@@ -126,8 +126,8 @@ public:
 };
 
 
-/// A single binding to a joint in an FBX document.
-class FBXCluster {
+/// A single binding to a joint.
+class HFMCluster {
 public:
 
     int jointIndex;
@@ -137,8 +137,8 @@ public:
 
 const int MAX_NUM_PIXELS_FOR_FBX_TEXTURE = 2048 * 2048;
 
-/// A texture map in an FBX document.
-class FBXTexture {
+/// A texture map.
+class HFMTexture {
 public:
     QString id;
     QString name;
@@ -156,7 +156,7 @@ public:
 };
 
 /// A single part of a mesh (with the same material).
-class FBXMeshPart {
+class HFMMeshPart {
 public:
 
     QVector<int> quadIndices; // original indices from the FBX mesh
@@ -166,10 +166,10 @@ public:
     QString materialID;
 };
 
-class FBXMaterial {
+class HFMMaterial {
 public:
-    FBXMaterial() {};
-    FBXMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
+    HFMMaterial() {};
+    HFMMaterial(const glm::vec3& diffuseColor, const glm::vec3& specularColor, const glm::vec3& emissiveColor,
          float shininess, float opacity) :
         diffuseColor(diffuseColor),
         specularColor(specularColor),
@@ -203,17 +203,17 @@ public:
     QString shadingModel;
     graphics::MaterialPointer _material;
 
-    FBXTexture normalTexture;
-    FBXTexture albedoTexture;
-    FBXTexture opacityTexture;
-    FBXTexture glossTexture;
-    FBXTexture roughnessTexture;
-    FBXTexture specularTexture;
-    FBXTexture metallicTexture;
-    FBXTexture emissiveTexture;
-    FBXTexture occlusionTexture;
-    FBXTexture scatteringTexture;
-    FBXTexture lightmapTexture;
+    HFMTexture normalTexture;
+    HFMTexture albedoTexture;
+    HFMTexture opacityTexture;
+    HFMTexture glossTexture;
+    HFMTexture roughnessTexture;
+    HFMTexture specularTexture;
+    HFMTexture metallicTexture;
+    HFMTexture emissiveTexture;
+    HFMTexture occlusionTexture;
+    HFMTexture scatteringTexture;
+    HFMTexture lightmapTexture;
     glm::vec2 lightmapParams{ 0.0f, 1.0f };
 
 
@@ -232,10 +232,10 @@ public:
 };
 
 /// A single mesh (with optional blendshapes) extracted from an FBX document.
-class FBXMesh {
+class HFMMesh {
 public:
 
-    QVector<FBXMeshPart> parts;
+    QVector<HFMMeshPart> parts;
 
     QVector<glm::vec3> vertices;
     QVector<glm::vec3> normals;
@@ -247,12 +247,12 @@ public:
     QVector<uint16_t> clusterWeights;
     QVector<int32_t> originalIndices;
 
-    QVector<FBXCluster> clusters;
+    QVector<HFMCluster> clusters;
 
     Extents meshExtents;
     glm::mat4 modelTransform;
 
-    QVector<FBXBlendshape> blendshapes;
+    QVector<HFMBlendshape> blendshapes;
 
     unsigned int meshIndex; // the order the meshes appeared in the object file
 
@@ -265,7 +265,7 @@ public:
 
 class ExtractedMesh {
 public:
-    FBXMesh mesh;
+    HFMMesh mesh;
     QMultiHash<int, int> newIndices;
     QVector<QHash<int, int> > blendshapeIndexMaps;
     QVector<QPair<int, int> > partMaterialTextures;
@@ -278,14 +278,14 @@ public:
  * @property {Vec3[]} translations
  */
 /// A single animation frame extracted from an FBX document.
-class FBXAnimationFrame {
+class HFMAnimationFrame {
 public:
     QVector<glm::quat> rotations;
     QVector<glm::vec3> translations;
 };
 
-/// A light in an FBX document.
-class FBXLight {
+/// A light.
+class HFMLight {
 public:
     QString name;
     Transform transform;
@@ -293,7 +293,7 @@ public:
     float fogValue;
     glm::vec3 color;
 
-    FBXLight() :
+    HFMLight() :
         name(),
         transform(),
         intensity(1.0f),
@@ -302,26 +302,26 @@ public:
     {}
 };
 
-Q_DECLARE_METATYPE(FBXAnimationFrame)
-Q_DECLARE_METATYPE(QVector<FBXAnimationFrame>)
+Q_DECLARE_METATYPE(HFMAnimationFrame)
+Q_DECLARE_METATYPE(QVector<HFMAnimationFrame>)
 
 /// A set of meshes extracted from an FBX document.
-class FBXGeometry {
+class HFMGeometry {
 public:
-    using Pointer = std::shared_ptr<FBXGeometry>;
+    using Pointer = std::shared_ptr<HFMGeometry>;
 
     QString originalURL;
     QString author;
     QString applicationName; ///< the name of the application that generated the model
 
-    QVector<FBXJoint> joints;
+    QVector<HFMJoint> joints;
     QHash<QString, int> jointIndices; ///< 1-based, so as to more easily detect missing indices
     bool hasSkeletonJoints;
 
-    QVector<FBXMesh> meshes;
+    QVector<HFMMesh> meshes;
     QVector<QString> scripts;
 
-    QHash<QString, FBXMaterial> materials;
+    QHash<QString, HFMMaterial> materials;
 
     glm::mat4 offset; // This includes offset, rotation, and scale as specified by the FST file
 
@@ -348,7 +348,7 @@ public:
     Extents bindExtents;
     Extents meshExtents;
 
-    QVector<FBXAnimationFrame> animationFrames;
+    QVector<HFMAnimationFrame> animationFrames;
 
     int getJointIndex(const QString& name) const { return jointIndices.value(name) - 1; }
     QStringList getJointNames() const;
@@ -368,7 +368,7 @@ public:
     QList<QString> blendshapeChannelNames;
 };
 
-Q_DECLARE_METATYPE(FBXGeometry)
-Q_DECLARE_METATYPE(FBXGeometry::Pointer)
+Q_DECLARE_METATYPE(HFMGeometry)
+Q_DECLARE_METATYPE(HFMGeometry::Pointer)
 
 #endif // hifi_FBX_h_
diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp
index dd766f002c..df6abbfdf2 100644
--- a/libraries/fbx/src/FBXReader.cpp
+++ b/libraries/fbx/src/FBXReader.cpp
@@ -40,19 +40,19 @@
 
 using namespace std;
 
-int FBXGeometryPointerMetaTypeId = qRegisterMetaType<FBXGeometry::Pointer>();
+int HFMGeometryPointerMetaTypeId = qRegisterMetaType<HFMGeometry::Pointer>();
 
-QStringList FBXGeometry::getJointNames() const {
+QStringList HFMGeometry::getJointNames() const {
     QStringList names;
-    foreach (const FBXJoint& joint, joints) {
+    foreach (const HFMJoint& joint, joints) {
         names.append(joint.name);
     }
     return names;
 }
 
-bool FBXGeometry::hasBlendedMeshes() const {
+bool HFMGeometry::hasBlendedMeshes() const {
     if (!meshes.isEmpty()) {
-        foreach (const FBXMesh& mesh, meshes) {
+        foreach (const HFMMesh& mesh, meshes) {
             if (!mesh.blendshapes.isEmpty()) {
                 return true;
             }
@@ -61,7 +61,7 @@ bool FBXGeometry::hasBlendedMeshes() const {
     return false;
 }
 
-Extents FBXGeometry::getUnscaledMeshExtents() const {
+Extents HFMGeometry::getUnscaledMeshExtents() const {
     const Extents& extents = meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
@@ -74,12 +74,12 @@ Extents FBXGeometry::getUnscaledMeshExtents() const {
 }
 
 // TODO: Move to graphics::Mesh when Sam's ready
-bool FBXGeometry::convexHullContains(const glm::vec3& point) const {
+bool HFMGeometry::convexHullContains(const glm::vec3& point) const {
     if (!getUnscaledMeshExtents().containsPoint(point)) {
         return false;
     }
 
-    auto checkEachPrimitive = [=](FBXMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
+    auto checkEachPrimitive = [=](HFMMesh& mesh, QVector<int> indices, int primitiveSize) -> bool {
         // Check whether the point is "behind" all the primitives.
         int verticesSize = mesh.vertices.size();
         for (int j = 0;
@@ -124,16 +124,16 @@ bool FBXGeometry::convexHullContains(const glm::vec3& point) const {
     return false;
 }
 
-QString FBXGeometry::getModelNameOfMesh(int meshIndex) const {
+QString HFMGeometry::getModelNameOfMesh(int meshIndex) const {
     if (meshIndicesToModelNames.contains(meshIndex)) {
         return meshIndicesToModelNames.value(meshIndex);
     }
     return QString();
 }
 
-int fbxGeometryMetaTypeId = qRegisterMetaType<FBXGeometry>();
-int fbxAnimationFrameMetaTypeId = qRegisterMetaType<FBXAnimationFrame>();
-int fbxAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<FBXAnimationFrame> >();
+int hfmGeometryMetaTypeId = qRegisterMetaType<HFMGeometry>();
+int hfmAnimationFrameMetaTypeId = qRegisterMetaType<HFMAnimationFrame>();
+int hfmAnimationFrameVectorMetaTypeId = qRegisterMetaType<QVector<HFMAnimationFrame> >();
 
 
 glm::vec3 parseVec3(const QString& string) {
@@ -303,7 +303,7 @@ glm::mat4 getGlobalTransform(const QMultiMap<QString, QString>& _connectionParen
 class ExtractedBlendshape {
 public:
     QString id;
-    FBXBlendshape blendshape;
+    HFMBlendshape blendshape;
 };
 
 void printNode(const FBXNode& node, int indentLevel) {
@@ -346,8 +346,8 @@ void appendModelIDs(const QString& parentID, const QMultiMap<QString, QString>&
     }
 }
 
-FBXBlendshape extractBlendshape(const FBXNode& object) {
-    FBXBlendshape blendshape;
+HFMBlendshape extractBlendshape(const FBXNode& object) {
+    HFMBlendshape blendshape;
     foreach (const FBXNode& data, object.children) {
         if (data.name == "Indexes") {
             blendshape.indices = FBXReader::getIntVector(data);
@@ -362,9 +362,9 @@ FBXBlendshape extractBlendshape(const FBXNode& object) {
     return blendshape;
 }
 
-using IndexAccessor = std::function<glm::vec3*(const FBXMesh&, int, int, glm::vec3*, glm::vec3&)>;
+using IndexAccessor = std::function<glm::vec3*(const HFMMesh&, int, int, glm::vec3*, glm::vec3&)>;
 
-static void setTangents(const FBXMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
+static void setTangents(const HFMMesh& mesh, const IndexAccessor& vertexAccessor, int firstIndex, int secondIndex,
                         const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents) {
     glm::vec3 vertex[2];
     glm::vec3 normal;
@@ -381,14 +381,14 @@ static void setTangents(const FBXMesh& mesh, const IndexAccessor& vertexAccessor
     }
 }
 
-static void createTangents(const FBXMesh& mesh, bool generateFromTexCoords,
+static void createTangents(const HFMMesh& mesh, bool generateFromTexCoords,
                            const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& normals, QVector<glm::vec3>& tangents,
                            IndexAccessor accessor) {
     // if we have a normal map (and texture coordinates), we must compute tangents
     if (generateFromTexCoords && !mesh.texCoords.isEmpty()) {
         tangents.resize(vertices.size());
 
-        foreach(const FBXMeshPart& part, mesh.parts) {
+        foreach(const HFMMeshPart& part, mesh.parts) {
             for (int i = 0; i < part.quadIndices.size(); i += 4) {
                 setTangents(mesh, accessor, part.quadIndices.at(i), part.quadIndices.at(i + 1), vertices, normals, tangents);
                 setTangents(mesh, accessor, part.quadIndices.at(i + 1), part.quadIndices.at(i + 2), vertices, normals, tangents);
@@ -403,27 +403,27 @@ static void createTangents(const FBXMesh& mesh, bool generateFromTexCoords,
                 setTangents(mesh, accessor, part.triangleIndices.at(i + 2), part.triangleIndices.at(i), vertices, normals, tangents);
             }
             if ((part.triangleIndices.size() % 3) != 0) {
-                qCDebug(modelformat) << "Error in extractFBXGeometry part.triangleIndices.size() is not divisible by three ";
+                qCDebug(modelformat) << "Error in extractHFMGeometry part.triangleIndices.size() is not divisible by three ";
             }
         }
     }
 }
 
-static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape);
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape);
 
-void FBXMesh::createBlendShapeTangents(bool generateTangents) {
+void HFMMesh::createBlendShapeTangents(bool generateTangents) {
     for (auto& blendShape : blendshapes) {
         _createBlendShapeTangents(*this, generateTangents, blendShape);
     }
 }
 
-void FBXMesh::createMeshTangents(bool generateFromTexCoords) {
-    FBXMesh& mesh = *this;
+void HFMMesh::createMeshTangents(bool generateFromTexCoords) {
+    HFMMesh& mesh = *this;
     // This is the only workaround I've found to trick the compiler into understanding that mesh.tangents isn't
     // const in the lambda function.
     auto& tangents = mesh.tangents;
     createTangents(mesh, generateFromTexCoords, mesh.vertices, mesh.normals, mesh.tangents, 
-                   [&](const FBXMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
         outVertices[0] = mesh.vertices[firstIndex];
         outVertices[1] = mesh.vertices[secondIndex];
         outNormal = mesh.normals[firstIndex];
@@ -431,7 +431,7 @@ void FBXMesh::createMeshTangents(bool generateFromTexCoords) {
     });
 }
 
-static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords, FBXBlendshape& blendShape) {
+static void _createBlendShapeTangents(HFMMesh& mesh, bool generateFromTexCoords, HFMBlendshape& blendShape) {
     // Create lookup to get index in blend shape from vertex index in mesh
     std::vector<int> reverseIndices;
     reverseIndices.resize(mesh.vertices.size());
@@ -443,7 +443,7 @@ static void _createBlendShapeTangents(FBXMesh& mesh, bool generateFromTexCoords,
     }
 
     createTangents(mesh, generateFromTexCoords, blendShape.vertices, blendShape.normals, blendShape.tangents,
-                   [&](const FBXMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
+                   [&](const HFMMesh& mesh, int firstIndex, int secondIndex, glm::vec3* outVertices, glm::vec3& outNormal) {
         const auto index1 = reverseIndices[firstIndex];
         const auto index2 = reverseIndices[secondIndex];
 
@@ -481,7 +481,7 @@ void addBlendshapes(const ExtractedBlendshape& extracted, const QList<WeightedIn
     foreach (const WeightedIndex& index, indices) {
         extractedMesh.mesh.blendshapes.resize(max(extractedMesh.mesh.blendshapes.size(), index.first + 1));
         extractedMesh.blendshapeIndexMaps.resize(extractedMesh.mesh.blendshapes.size());
-        FBXBlendshape& blendshape = extractedMesh.mesh.blendshapes[index.first];
+        HFMBlendshape& blendshape = extractedMesh.mesh.blendshapes[index.first];
         QHash<int, int>& blendshapeIndexMap = extractedMesh.blendshapeIndexMaps[index.first];
         for (int i = 0; i < extracted.blendshape.indices.size(); i++) {
             int oldIndex = extracted.blendshape.indices.at(i);
@@ -539,7 +539,7 @@ public:
     QVector<float> values;
 };
 
-bool checkMaterialsHaveTextures(const QHash<QString, FBXMaterial>& materials,
+bool checkMaterialsHaveTextures(const QHash<QString, HFMMaterial>& materials,
         const QHash<QString, QByteArray>& textureFilenames, const QMultiMap<QString, QString>& _connectionChildMap) {
     foreach (const QString& materialID, materials.keys()) {
         foreach (const QString& childID, _connectionChildMap.values(materialID)) {
@@ -569,8 +569,8 @@ int matchTextureUVSetToAttributeChannel(const QString& texUVSetName, const QHash
 }
 
 
-FBXLight extractLight(const FBXNode& object) {
-    FBXLight light;
+HFMLight extractLight(const FBXNode& object) {
+    HFMLight light;
     foreach (const FBXNode& subobject, object.children) {
         QString childname = QString(subobject.name);
         if (subobject.name == "Properties70") {
@@ -615,7 +615,7 @@ QByteArray fileOnUrl(const QByteArray& filepath, const QString& url) {
     return filepath.mid(filepath.lastIndexOf('/') + 1);
 }
 
-FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QString& url) {
+HFMGeometry* FBXReader::extractHFMGeometry(const QVariantHash& mapping, const QString& url) {
     const FBXNode& node = _rootNode;
     QMap<QString, ExtractedMesh> meshes;
     QHash<QString, QString> modelIDsToNames;
@@ -636,7 +636,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     QHash<QString, QString> yComponents;
     QHash<QString, QString> zComponents;
 
-    std::map<QString, FBXLight> lights;
+    std::map<QString, HFMLight> lights;
 
     QVariantHash joints = mapping.value("joint").toHash();
     QString jointEyeLeftName = processID(getString(joints.value("jointEyeLeft", "jointEyeLeft")));
@@ -689,8 +689,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 #if defined(DEBUG_FBXREADER)
     int unknown = 0;
 #endif
-    FBXGeometry* geometryPtr = new FBXGeometry;
-    FBXGeometry& geometry = *geometryPtr;
+    HFMGeometry* geometryPtr = new HFMGeometry;
+    HFMGeometry& geometry = *geometryPtr;
 
     geometry.originalURL = url;
 
@@ -944,7 +944,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                                         lightprop = vprop.toString();
                                     }
 
-                                    FBXLight light = extractLight(object);
+                                    HFMLight light = extractLight(object);
                                 }
                             }
                         } else {
@@ -1102,7 +1102,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         _textureContent.insert(filepath, content);
                     }
                 } else if (object.name == "Material") {
-                    FBXMaterial material;
+                    HFMMaterial material;
                     material.name = (object.properties.at(1).toString());
                     foreach (const FBXNode& subobject, object.children) {
                         bool properties = false;
@@ -1255,7 +1255,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 #endif
                     }
                     material.materialID = getID(object.properties);
-                    _fbxMaterials.insert(material.materialID, material);
+                    _hfmMaterials.insert(material.materialID, material);
 
 
                 } else if (object.name == "NodeAttribute") {
@@ -1276,7 +1276,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
                     if (!attributetype.isEmpty()) {
                         if (attributetype == "Light") {
-                            FBXLight light = extractLight(object);
+                            HFMLight light = extractLight(object);
                             lights[attribID] = light;
                         }
                     }
@@ -1345,7 +1345,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                         QString parentID = getID(connection.properties, 2);
                         ooChildToParent.insert(childID, parentID);
                         if (!hifiGlobalNodeID.isEmpty() && (parentID == hifiGlobalNodeID)) {
-                            std::map< QString, FBXLight >::iterator lightIt = lights.find(childID);
+                            std::map< QString, HFMLight >::iterator lightIt = lights.find(childID);
                             if (lightIt != lights.end()) {
                                 _lightmapLevel = (*lightIt).second.intensity;
                                 if (_lightmapLevel <= 0.0f) {
@@ -1504,7 +1504,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         frameCount = qMax(frameCount, curve.values.size());
     }
     for (int i = 0; i < frameCount; i++) {
-        FBXAnimationFrame frame;
+        HFMAnimationFrame frame;
         frame.rotations.resize(modelIDs.size());
         frame.translations.resize(modelIDs.size());
         geometry.animationFrames.append(frame);
@@ -1515,7 +1515,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     geometry.hasSkeletonJoints = false;
     foreach (const QString& modelID, modelIDs) {
         const FBXModel& model = models[modelID];
-        FBXJoint joint;
+        HFMJoint joint;
         joint.isFree = freeJoints.contains(model.name);
         joint.parentIndex = model.parentIndex;
 
@@ -1553,7 +1553,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             joint.distanceToParent = 0.0f;
 
         } else {
-            const FBXJoint& parentJoint = geometry.joints.at(joint.parentIndex);
+            const HFMJoint& parentJoint = geometry.joints.at(joint.parentIndex);
             joint.transform = parentJoint.transform * glm::translate(joint.translation) *
                 joint.preTransform * glm::mat4_cast(combinedRotation) * joint.postTransform;
             joint.inverseDefaultRotation = glm::inverse(combinedRotation) * parentJoint.inverseDefaultRotation;
@@ -1631,7 +1631,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     geometry.meshExtents.reset();
 
     // Create the Material Library
-    consolidateFBXMaterials(mapping);
+    consolidateHFMMaterials(mapping);
 
     // We can't allow the scaling of a given image to different sizes, because the hash used for the KTX cache is based on the original image
     // Allowing scaling of the same image to different sizes would cause different KTX files to target the same cache key
@@ -1643,7 +1643,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     //   33 - 128 textures --> 512
     // etc...
     QSet<QString> uniqueTextures;
-    for (auto& material : _fbxMaterials) {
+    for (auto& material : _hfmMaterials) {
         material.getTextureNames(uniqueTextures);
     }
     int numTextures = uniqueTextures.size();
@@ -1659,15 +1659,15 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         } while (numTextureThreshold < numTextures && maxWidth > MIN_MIP_TEXTURE_WIDTH);
 
         qCDebug(modelformat) << "Capped square texture width =" << maxWidth << "for model" << url << "with" << numTextures << "textures";
-        for (auto& material : _fbxMaterials) {
+        for (auto& material : _hfmMaterials) {
             material.setMaxNumPixelsPerTexture(maxWidth * maxWidth);
         }
     }
 #endif
-    geometry.materials = _fbxMaterials;
+    geometry.materials = _hfmMaterials;
 
     // see if any materials have texture children
-    bool materialsHaveTextures = checkMaterialsHaveTextures(_fbxMaterials, _textureFilenames, _connectionChildMap);
+    bool materialsHaveTextures = checkMaterialsHaveTextures(_hfmMaterials, _textureFilenames, _connectionChildMap);
 
     for (QMap<QString, ExtractedMesh>::iterator it = meshes.begin(); it != meshes.end(); it++) {
         ExtractedMesh& extracted = it.value();
@@ -1698,13 +1698,13 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         for (int i = children.size() - 1; i >= 0; i--) {
 
             const QString& childID = children.at(i);
-            if (_fbxMaterials.contains(childID)) {
+            if (_hfmMaterials.contains(childID)) {
                 // the pure material associated with this part
-                FBXMaterial material = _fbxMaterials.value(childID);
+                HFMMaterial material = _hfmMaterials.value(childID);
 
                 for (int j = 0; j < extracted.partMaterialTextures.size(); j++) {
                     if (extracted.partMaterialTextures.at(j).first == materialIndex) {
-                        FBXMeshPart& part = extracted.mesh.parts[j];
+                        HFMMeshPart& part = extracted.mesh.parts[j];
                         part.materialID = material.materialID;
                         generateTangents |= material.needTangentSpace();
                     }
@@ -1713,7 +1713,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 materialIndex++;
 
             } else if (_textureFilenames.contains(childID)) {
-                FBXTexture texture = getTexture(childID);
+                HFMTexture texture = getTexture(childID);
                 for (int j = 0; j < extracted.partMaterialTextures.size(); j++) {
                     int partTexture = extracted.partMaterialTextures.at(j).second;
                     if (partTexture == textureIndex && !(partTexture == 0 && materialsHaveTextures)) {
@@ -1736,34 +1736,34 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
                 if (!clusters.contains(clusterID)) {
                     continue;
                 }
-                FBXCluster fbxCluster;
+                HFMCluster hfmCluster;
                 const Cluster& cluster = clusters[clusterID];
                 clusterIDs.append(clusterID);
 
                 // see http://stackoverflow.com/questions/13566608/loading-skinning-information-from-fbx for a discussion
                 // of skinning information in FBX
                 QString jointID = _connectionChildMap.value(clusterID);
-                fbxCluster.jointIndex = modelIDs.indexOf(jointID);
-                if (fbxCluster.jointIndex == -1) {
+                hfmCluster.jointIndex = modelIDs.indexOf(jointID);
+                if (hfmCluster.jointIndex == -1) {
                     qCDebug(modelformat) << "Joint not in model list: " << jointID;
-                    fbxCluster.jointIndex = 0;
+                    hfmCluster.jointIndex = 0;
                 }
 
-                fbxCluster.inverseBindMatrix = glm::inverse(cluster.transformLink) * modelTransform;
+                hfmCluster.inverseBindMatrix = glm::inverse(cluster.transformLink) * modelTransform;
 
                 // slam bottom row to (0, 0, 0, 1), we KNOW this is not a perspective matrix and
                 // sometimes floating point fuzz can be introduced after the inverse.
-                fbxCluster.inverseBindMatrix[0][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[1][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[2][3] = 0.0f;
-                fbxCluster.inverseBindMatrix[3][3] = 1.0f;
+                hfmCluster.inverseBindMatrix[0][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[1][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[2][3] = 0.0f;
+                hfmCluster.inverseBindMatrix[3][3] = 1.0f;
 
-                fbxCluster.inverseBindTransform = Transform(fbxCluster.inverseBindMatrix);
+                hfmCluster.inverseBindTransform = Transform(hfmCluster.inverseBindMatrix);
 
-                extracted.mesh.clusters.append(fbxCluster);
+                extracted.mesh.clusters.append(hfmCluster);
 
                 // override the bind rotation with the transform link
-                FBXJoint& joint = geometry.joints[fbxCluster.jointIndex];
+                HFMJoint& joint = geometry.joints[hfmCluster.jointIndex];
                 joint.inverseBindRotation = glm::inverse(extractRotation(cluster.transformLink));
                 joint.bindTransform = cluster.transformLink;
                 joint.bindTransformFoundInCluster = true;
@@ -1776,7 +1776,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
         // if we don't have a skinned joint, parent to the model itself
         if (extracted.mesh.clusters.isEmpty()) {
-            FBXCluster cluster;
+            HFMCluster cluster;
             cluster.jointIndex = modelIDs.indexOf(modelID);
             if (cluster.jointIndex == -1) {
                 qCDebug(modelformat) << "Model not in model list: " << modelID;
@@ -1786,7 +1786,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
         }
 
         // whether we're skinned depends on how many clusters are attached
-        const FBXCluster& firstFBXCluster = extracted.mesh.clusters.at(0);
+        const HFMCluster& firstHFMCluster = extracted.mesh.clusters.at(0);
         glm::mat4 inverseModelTransform = glm::inverse(modelTransform);
         if (clusterIDs.size() > 1) {
             // this is a multi-mesh joint
@@ -1799,9 +1799,9 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             for (int i = 0; i < clusterIDs.size(); i++) {
                 QString clusterID = clusterIDs.at(i);
                 const Cluster& cluster = clusters[clusterID];
-                const FBXCluster& fbxCluster = extracted.mesh.clusters.at(i);
-                int jointIndex = fbxCluster.jointIndex;
-                FBXJoint& joint = geometry.joints[jointIndex];
+                const HFMCluster& hfmCluster = extracted.mesh.clusters.at(i);
+                int jointIndex = hfmCluster.jointIndex;
+                HFMJoint& joint = geometry.joints[jointIndex];
                 glm::mat4 transformJointToMesh = inverseModelTransform * joint.bindTransform;
                 glm::vec3 boneEnd = extractTranslation(transformJointToMesh);
                 glm::vec3 boneBegin = boneEnd;
@@ -1881,8 +1881,8 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
             }
         } else {
             // this is a single-mesh joint
-            int jointIndex = firstFBXCluster.jointIndex;
-            FBXJoint& joint = geometry.joints[jointIndex];
+            int jointIndex = firstHFMCluster.jointIndex;
+            HFMJoint& joint = geometry.joints[jointIndex];
 
             // transform cluster vertices to joint-frame and save for later
             glm::mat4 meshToJoint = glm::inverse(joint.bindTransform) * modelTransform;
@@ -1924,7 +1924,7 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
 
     // now that all joints have been scanned compute a k-Dop bounding volume of mesh
     for (int i = 0; i < geometry.joints.size(); ++i) {
-        FBXJoint& joint = geometry.joints[i];
+        HFMJoint& joint = geometry.joints[i];
 
         // NOTE: points are in joint-frame
         ShapeVertices& points = shapeVertices.at(i);
@@ -1994,13 +1994,13 @@ FBXGeometry* FBXReader::extractFBXGeometry(const QVariantHash& mapping, const QS
     return geometryPtr;
 }
 
-FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     QBuffer buffer(const_cast<QByteArray*>(&model));
     buffer.open(QIODevice::ReadOnly);
     return readFBX(&buffer, mapping, url, loadLightmaps, lightmapLevel);
 }
 
-FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
+HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url, bool loadLightmaps, float lightmapLevel) {
     FBXReader reader;
     reader._rootNode = FBXReader::parseFBX(device);
     reader._loadLightmaps = loadLightmaps;
@@ -2008,5 +2008,5 @@ FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QStri
 
     qCDebug(modelformat) << "Reading FBX: " << url;
 
-    return reader.extractFBXGeometry(mapping, url);
+    return reader.extractHFMGeometry(mapping, url);
 }
diff --git a/libraries/fbx/src/FBXReader.h b/libraries/fbx/src/FBXReader.h
index c391ea6647..f95ba7fe73 100644
--- a/libraries/fbx/src/FBXReader.h
+++ b/libraries/fbx/src/FBXReader.h
@@ -36,11 +36,11 @@ class FBXNode;
 
 /// Reads FBX geometry from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-FBXGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMGeometry* readFBX(const QByteArray& model, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
 /// Reads FBX geometry from the supplied model and mapping data.
 /// \exception QString if an error occurs in parsing
-FBXGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
+HFMGeometry* readFBX(QIODevice* device, const QVariantHash& mapping, const QString& url = "", bool loadLightmaps = true, float lightmapLevel = 1.0f);
 
 class TextureParam {
 public:
@@ -103,20 +103,20 @@ class ExtractedMesh;
 
 class FBXReader {
 public:
-    FBXGeometry* _fbxGeometry;
+    HFMGeometry* _hfmGeometry;
 
     FBXNode _rootNode;
     static FBXNode parseFBX(QIODevice* device);
 
-    FBXGeometry* extractFBXGeometry(const QVariantHash& mapping, const QString& url);
+    HFMGeometry* extractHFMGeometry(const QVariantHash& mapping, const QString& url);
 
     static ExtractedMesh extractMesh(const FBXNode& object, unsigned int& meshIndex, bool deduplicate = true);
     QHash<QString, ExtractedMesh> meshes;
-    static void buildModelMesh(FBXMesh& extractedMesh, const QString& url);
+    static void buildModelMesh(HFMMesh& extractedMesh, const QString& url);
 
     static glm::vec3 normalizeDirForPacking(const glm::vec3& dir);
 
-    FBXTexture getTexture(const QString& textureID);
+    HFMTexture getTexture(const QString& textureID);
 
     QHash<QString, QString> _textureNames;
     // Hashes the original RelativeFilename of textures
@@ -142,9 +142,9 @@ public:
     QHash<QString, QString> ambientFactorTextures;
     QHash<QString, QString> occlusionTextures;
 
-    QHash<QString, FBXMaterial> _fbxMaterials;
+    QHash<QString, HFMMaterial> _hfmMaterials;
 
-    void consolidateFBXMaterials(const QVariantHash& mapping);
+    void consolidateHFMMaterials(const QVariantHash& mapping);
 
     bool _loadLightmaps = true;
     float _lightmapOffset = 0.0f;
diff --git a/libraries/fbx/src/FBXReader_Material.cpp b/libraries/fbx/src/FBXReader_Material.cpp
index d5902962e5..ff1de30b97 100644
--- a/libraries/fbx/src/FBXReader_Material.cpp
+++ b/libraries/fbx/src/FBXReader_Material.cpp
@@ -27,7 +27,7 @@
 
 #include "ModelFormatLogging.h"
 
-void FBXMaterial::getTextureNames(QSet<QString>& textureList) const {
+void HFMMaterial::getTextureNames(QSet<QString>& textureList) const {
     if (!normalTexture.isNull()) {
         textureList.insert(normalTexture.name);
     }
@@ -63,7 +63,7 @@ void FBXMaterial::getTextureNames(QSet<QString>& textureList) const {
     }
 }
 
-void FBXMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
+void HFMMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
     normalTexture.maxNumPixels = maxNumPixels;
     albedoTexture.maxNumPixels = maxNumPixels;
     opacityTexture.maxNumPixels = maxNumPixels;
@@ -77,12 +77,12 @@ void FBXMaterial::setMaxNumPixelsPerTexture(int maxNumPixels) {
     lightmapTexture.maxNumPixels = maxNumPixels;
 }
 
-bool FBXMaterial::needTangentSpace() const {
+bool HFMMaterial::needTangentSpace() const {
     return !normalTexture.isNull();
 }
 
-FBXTexture FBXReader::getTexture(const QString& textureID) {
-    FBXTexture texture;
+HFMTexture FBXReader::getTexture(const QString& textureID) {
+    HFMTexture texture;
     const QByteArray& filepath = _textureFilepaths.value(textureID);
     texture.content = _textureContent.value(filepath);
 
@@ -123,7 +123,7 @@ FBXTexture FBXReader::getTexture(const QString& textureID) {
     return texture;
 }
 
-void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
+void FBXReader::consolidateHFMMaterials(const QVariantHash& mapping) {
 
     QString materialMapString = mapping.value("materialMap").toString();
     QJsonDocument materialMapDocument = QJsonDocument::fromJson(materialMapString.toUtf8());
@@ -133,16 +133,16 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             qCDebug(modelformat) << "fbx Material Map found but did not produce valid JSON:" << materialMapString;
         }
     }
-    for (QHash<QString, FBXMaterial>::iterator it = _fbxMaterials.begin(); it != _fbxMaterials.end(); it++) {
-        FBXMaterial& material = (*it);
+    for (QHash<QString, HFMMaterial>::iterator it = _hfmMaterials.begin(); it != _hfmMaterials.end(); it++) {
+        HFMMaterial& material = (*it);
 
         // Maya is the exporting the shading model and we are trying to use it
         bool isMaterialLambert = (material.shadingModel.toLower() == "lambert");
 
         // the pure material associated with this part
         bool detectDifferentUVs = false;
-        FBXTexture diffuseTexture;
-        FBXTexture diffuseFactorTexture;
+        HFMTexture diffuseTexture;
+        HFMTexture diffuseFactorTexture;
         QString diffuseTextureID = diffuseTextures.value(material.materialID);
         QString diffuseFactorTextureID = diffuseFactorTextures.value(material.materialID);
 
@@ -169,7 +169,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs = (diffuseTexture.texcoordSet != 0) || (!diffuseTexture.transform.isIdentity());
         }
 
-        FBXTexture transparentTexture;
+        HFMTexture transparentTexture;
         QString transparentTextureID = transparentTextures.value(material.materialID);
         // If PBS Material, systematically bind the albedo texture as transparency texture and check for the alpha channel
         if (material.isPBSMaterial) {
@@ -181,7 +181,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (transparentTexture.texcoordSet != 0) || (!transparentTexture.transform.isIdentity());
         }
 
-        FBXTexture normalTexture;
+        HFMTexture normalTexture;
         QString bumpTextureID = bumpTextures.value(material.materialID);
         QString normalTextureID = normalTextures.value(material.materialID);
         if (!normalTextureID.isNull()) {
@@ -198,7 +198,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (normalTexture.texcoordSet != 0) || (!normalTexture.transform.isIdentity());
         }
 
-        FBXTexture specularTexture;
+        HFMTexture specularTexture;
         QString specularTextureID = specularTextures.value(material.materialID);
         if (!specularTextureID.isNull()) {
             specularTexture = getTexture(specularTextureID);
@@ -206,7 +206,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             material.specularTexture = specularTexture;
         }
 
-        FBXTexture metallicTexture;
+        HFMTexture metallicTexture;
         QString metallicTextureID = metallicTextures.value(material.materialID);
         if (!metallicTextureID.isNull()) {
             metallicTexture = getTexture(metallicTextureID);
@@ -214,7 +214,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             material.metallicTexture = metallicTexture;
         }
 
-        FBXTexture roughnessTexture;
+        HFMTexture roughnessTexture;
         QString roughnessTextureID = roughnessTextures.value(material.materialID);
         if (!roughnessTextureID.isNull()) {
             roughnessTexture = getTexture(roughnessTextureID);
@@ -222,7 +222,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (roughnessTexture.texcoordSet != 0) || (!roughnessTexture.transform.isIdentity());
         }
 
-        FBXTexture shininessTexture;
+        HFMTexture shininessTexture;
         QString shininessTextureID = shininessTextures.value(material.materialID);
         if (!shininessTextureID.isNull()) {
             shininessTexture = getTexture(shininessTextureID);
@@ -230,7 +230,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             detectDifferentUVs |= (shininessTexture.texcoordSet != 0) || (!shininessTexture.transform.isIdentity());
         }
 
-        FBXTexture emissiveTexture;
+        HFMTexture emissiveTexture;
         QString emissiveTextureID = emissiveTextures.value(material.materialID);
         if (!emissiveTextureID.isNull()) {
             emissiveTexture = getTexture(emissiveTextureID);
@@ -245,7 +245,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
             }
         }
 
-        FBXTexture occlusionTexture;
+        HFMTexture occlusionTexture;
         QString occlusionTextureID = occlusionTextures.value(material.materialID);
         if (occlusionTextureID.isNull()) {
             // 2nd chance
@@ -265,7 +265,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
         lightmapParams.x = _lightmapOffset;
         lightmapParams.y = _lightmapLevel;
 
-        FBXTexture ambientTexture;
+        HFMTexture ambientTexture;
         QString ambientTextureID = ambientTextures.value(material.materialID);
         if (ambientTextureID.isNull()) {
             // 2nd chance
@@ -326,7 +326,7 @@ void FBXReader::consolidateFBXMaterials(const QVariantHash& mapping) {
 
             if (materialOptions.contains("scatteringMap")) {
                 QByteArray scatteringMap = materialOptions.value("scatteringMap").toVariant().toByteArray();
-                material.scatteringTexture = FBXTexture();
+                material.scatteringTexture = HFMTexture();
                 material.scatteringTexture.name = material.name + ".scatteringMap";
                 material.scatteringTexture.filename = scatteringMap;
             }
diff --git a/libraries/fbx/src/FBXReader_Mesh.cpp b/libraries/fbx/src/FBXReader_Mesh.cpp
index c9b004c3a8..e098aff99a 100644
--- a/libraries/fbx/src/FBXReader_Mesh.cpp
+++ b/libraries/fbx/src/FBXReader_Mesh.cpp
@@ -42,9 +42,9 @@
 
 using vec2h = glm::tvec2<glm::detail::hdata>;
 
-#define FBX_PACK_COLORS 1
+#define HFM_PACK_COLORS 1
 
-#if FBX_PACK_COLORS
+#if HFM_PACK_COLORS
 using ColorType = glm::uint32;
 #define FBX_COLOR_ELEMENT gpu::Element::COLOR_RGBA_32
 #else
@@ -469,7 +469,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
 
                 QPair<int, int> materialTexture(materialID, 0);
 
-                // grab or setup the FBXMeshPart for the part this face belongs to
+                // grab or setup the HFMMeshPart for the part this face belongs to
                 int& partIndexPlusOne = materialTextureParts[materialTexture];
                 if (partIndexPlusOne == 0) {
                     data.extracted.partMaterialTextures.append(materialTexture);
@@ -478,7 +478,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                 }
 
                 // give the mesh part this index
-                FBXMeshPart& part = data.extracted.mesh.parts[partIndexPlusOne - 1];
+                HFMMeshPart& part = data.extracted.mesh.parts[partIndexPlusOne - 1];
                 part.triangleIndices.append(firstCorner.value());
                 part.triangleIndices.append(dracoFace[1].value());
                 part.triangleIndices.append(dracoFace[2].value());
@@ -511,7 +511,7 @@ ExtractedMesh FBXReader::extractMesh(const FBXNode& object, unsigned int& meshIn
                 data.extracted.mesh.parts.resize(data.extracted.mesh.parts.size() + 1);
                 partIndex = data.extracted.mesh.parts.size();
             }
-            FBXMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
+            HFMMeshPart& part = data.extracted.mesh.parts[partIndex - 1];
 
             if (endIndex - beginIndex == 4) {
                 appendIndex(data, part.quadIndices, beginIndex++, deduplicate);
@@ -565,9 +565,9 @@ glm::vec3 FBXReader::normalizeDirForPacking(const glm::vec3& dir) {
     return dir;
 }
 
-void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
+void FBXReader::buildModelMesh(HFMMesh& extractedMesh, const QString& url) {
     unsigned int totalSourceIndices = 0;
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         totalSourceIndices += (part.quadTrianglesIndices.size() + part.triangleIndices.size());
     }
 
@@ -583,17 +583,17 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
         return;
     }
 
-    FBXMesh& fbxMesh = extractedMesh;
+    HFMMesh& hfmMesh = extractedMesh;
     graphics::MeshPointer mesh(new graphics::Mesh());
     int numVerts = extractedMesh.vertices.size();
 
-    if (!fbxMesh.normals.empty() && fbxMesh.tangents.empty()) {
+    if (!hfmMesh.normals.empty() && hfmMesh.tangents.empty()) {
         // Fill with a dummy value to force tangents to be present if there are normals
-        fbxMesh.tangents.reserve(fbxMesh.normals.size());
-        std::fill_n(std::back_inserter(fbxMesh.tangents), fbxMesh.normals.size(), Vectors::UNIT_X);
+        hfmMesh.tangents.reserve(hfmMesh.normals.size());
+        std::fill_n(std::back_inserter(hfmMesh.tangents), hfmMesh.normals.size(), Vectors::UNIT_X);
     }
     // Same thing with blend shapes
-    for (auto& blendShape : fbxMesh.blendshapes) {
+    for (auto& blendShape : hfmMesh.blendshapes) {
         if (!blendShape.normals.empty() && blendShape.tangents.empty()) {
             // Fill with a dummy value to force tangents to be present if there are normals
             blendShape.tangents.reserve(blendShape.normals.size());
@@ -609,8 +609,8 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Normal and tangent are always there together packed in normalized xyz32bits word (times 2)
     const auto normalElement = FBX_NORMAL_ELEMENT;
-    const int normalsSize = fbxMesh.normals.size() * normalElement.getSize();
-    const int tangentsSize = fbxMesh.tangents.size() * normalElement.getSize();
+    const int normalsSize = hfmMesh.normals.size() * normalElement.getSize();
+    const int tangentsSize = hfmMesh.tangents.size() * normalElement.getSize();
     // If there are normals then there should be tangents
     assert(normalsSize <= tangentsSize);
     if (tangentsSize > normalsSize) {
@@ -620,22 +620,22 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Color attrib
     const auto colorElement = FBX_COLOR_ELEMENT;
-    const int colorsSize = fbxMesh.colors.size() * colorElement.getSize();
+    const int colorsSize = hfmMesh.colors.size() * colorElement.getSize();
    
     // Texture coordinates are stored in 2 half floats
     const auto texCoordsElement = gpu::Element(gpu::VEC2, gpu::HALF, gpu::UV);
-    const int texCoordsSize = fbxMesh.texCoords.size() * texCoordsElement.getSize();
-    const int texCoords1Size = fbxMesh.texCoords1.size() * texCoordsElement.getSize();
+    const int texCoordsSize = hfmMesh.texCoords.size() * texCoordsElement.getSize();
+    const int texCoords1Size = hfmMesh.texCoords1.size() * texCoordsElement.getSize();
 
     // Support for 4 skinning clusters:
     // 4 Indices are uint8 ideally, uint16 if more than 256.
-    const auto clusterIndiceElement = (fbxMesh.clusters.size() < UINT8_MAX ? gpu::Element(gpu::VEC4, gpu::UINT8, gpu::XYZW) : gpu::Element(gpu::VEC4, gpu::UINT16, gpu::XYZW));
+    const auto clusterIndiceElement = (hfmMesh.clusters.size() < UINT8_MAX ? gpu::Element(gpu::VEC4, gpu::UINT8, gpu::XYZW) : gpu::Element(gpu::VEC4, gpu::UINT16, gpu::XYZW));
     // 4 Weights are normalized 16bits
     const auto clusterWeightElement = gpu::Element(gpu::VEC4, gpu::NUINT16, gpu::XYZW);
 
     // Cluster indices and weights must be the same sizes
     const int NUM_CLUSTERS_PER_VERT = 4;
-    const int numVertClusters = (fbxMesh.clusterIndices.size() == fbxMesh.clusterWeights.size() ? fbxMesh.clusterIndices.size() / NUM_CLUSTERS_PER_VERT : 0);
+    const int numVertClusters = (hfmMesh.clusterIndices.size() == hfmMesh.clusterWeights.size() ? hfmMesh.clusterIndices.size() / NUM_CLUSTERS_PER_VERT : 0);
     const int clusterIndicesSize = numVertClusters * clusterIndiceElement.getSize();
     const int clusterWeightsSize = numVertClusters * clusterWeightElement.getSize();
 
@@ -660,9 +660,9 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     if (normalsSize > 0) {
         std::vector<NormalType> normalsAndTangents;
 
-        normalsAndTangents.reserve(fbxMesh.normals.size() + fbxMesh.tangents.size());
-        for (auto normalIt = fbxMesh.normals.constBegin(), tangentIt = fbxMesh.tangents.constBegin();
-            normalIt != fbxMesh.normals.constEnd();
+        normalsAndTangents.reserve(hfmMesh.normals.size() + hfmMesh.tangents.size());
+        for (auto normalIt = hfmMesh.normals.constBegin(), tangentIt = hfmMesh.tangents.constBegin();
+            normalIt != hfmMesh.normals.constEnd();
             ++normalIt, ++tangentIt) {
 #if FBX_PACK_NORMALS
             const auto normal = normalizeDirForPacking(*normalIt);
@@ -681,24 +681,24 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Pack colors
     if (colorsSize > 0) {
-#if FBX_PACK_COLORS
+#if HFM_PACK_COLORS
         std::vector<ColorType> colors;
 
-        colors.reserve(fbxMesh.colors.size());
-        for (const auto& color : fbxMesh.colors) {
+        colors.reserve(hfmMesh.colors.size());
+        for (const auto& color : hfmMesh.colors) {
             colors.push_back(glm::packUnorm4x8(glm::vec4(color, 1.0f)));
         }
         vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) colors.data());
 #else
-        vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) fbxMesh.colors.constData());
+        vertBuffer->setSubData(colorsOffset, colorsSize, (const gpu::Byte*) hfmMesh.colors.constData());
 #endif
     }
 
     // Pack Texcoords 0 and 1 (if exists)
     if (texCoordsSize > 0) {
         QVector<vec2h> texCoordData;
-        texCoordData.reserve(fbxMesh.texCoords.size());
-        for (auto& texCoordVec2f : fbxMesh.texCoords) {
+        texCoordData.reserve(hfmMesh.texCoords.size());
+        for (auto& texCoordVec2f : hfmMesh.texCoords) {
             vec2h texCoordVec2h;
 
             texCoordVec2h.x = glm::detail::toFloat16(texCoordVec2f.x);
@@ -709,8 +709,8 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     }
     if (texCoords1Size > 0) {
         QVector<vec2h> texCoordData;
-        texCoordData.reserve(fbxMesh.texCoords1.size());
-        for (auto& texCoordVec2f : fbxMesh.texCoords1) {
+        texCoordData.reserve(hfmMesh.texCoords1.size());
+        for (auto& texCoordVec2f : hfmMesh.texCoords1) {
             vec2h texCoordVec2h;
 
             texCoordVec2h.x = glm::detail::toFloat16(texCoordVec2f.x);
@@ -722,22 +722,22 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Clusters data
     if (clusterIndicesSize > 0) {
-        if (fbxMesh.clusters.size() < UINT8_MAX) {
+        if (hfmMesh.clusters.size() < UINT8_MAX) {
             // yay! we can fit the clusterIndices within 8-bits
-            int32_t numIndices = fbxMesh.clusterIndices.size();
+            int32_t numIndices = hfmMesh.clusterIndices.size();
             QVector<uint8_t> clusterIndices;
             clusterIndices.resize(numIndices);
             for (int32_t i = 0; i < numIndices; ++i) {
-                assert(fbxMesh.clusterIndices[i] <= UINT8_MAX);
-                clusterIndices[i] = (uint8_t)(fbxMesh.clusterIndices[i]);
+                assert(hfmMesh.clusterIndices[i] <= UINT8_MAX);
+                clusterIndices[i] = (uint8_t)(hfmMesh.clusterIndices[i]);
             }
             vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) clusterIndices.constData());
         } else {
-            vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) fbxMesh.clusterIndices.constData());
+            vertBuffer->setSubData(clusterIndicesOffset, clusterIndicesSize, (const gpu::Byte*) hfmMesh.clusterIndices.constData());
         }
     }
     if (clusterWeightsSize > 0) {
-        vertBuffer->setSubData(clusterWeightsOffset, clusterWeightsSize, (const gpu::Byte*) fbxMesh.clusterWeights.constData());
+        vertBuffer->setSubData(clusterWeightsOffset, clusterWeightsSize, (const gpu::Byte*) hfmMesh.clusterWeights.constData());
     }
 
 
@@ -856,7 +856,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
 
     // Index and Part Buffers
     unsigned int totalIndices = 0;
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         totalIndices += (part.quadTrianglesIndices.size() + part.triangleIndices.size());
     }
 
@@ -875,7 +875,7 @@ void FBXReader::buildModelMesh(FBXMesh& extractedMesh, const QString& url) {
     if (extractedMesh.parts.size() > 1) {
         indexNum = 0;
     }
-    foreach(const FBXMeshPart& part, extractedMesh.parts) {
+    foreach(const HFMMeshPart& part, extractedMesh.parts) {
         graphics::Mesh::Part modelPart(indexNum, 0, 0, graphics::Mesh::TRIANGLES);
         
         if (part.quadTrianglesIndices.size()) {
diff --git a/libraries/fbx/src/GLTFReader.cpp b/libraries/fbx/src/GLTFReader.cpp
index b93dc3541b..7ee13c5cdf 100644
--- a/libraries/fbx/src/GLTFReader.cpp
+++ b/libraries/fbx/src/GLTFReader.cpp
@@ -697,7 +697,7 @@ glm::mat4 GLTFReader::getModelTransform(const GLTFNode& node) {
     return tmat;
 }
 
-bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
+bool GLTFReader::buildGeometry(HFMGeometry& geometry, const QUrl& url) {
 
     //Build dependencies
     QVector<QVector<int>> nodeDependencies(_file.nodes.size());
@@ -750,10 +750,10 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
 
     for (int i = 0; i < materialIDs.size(); i++) {
         QString& matid = materialIDs[i];
-        geometry.materials[matid] = FBXMaterial();
-        FBXMaterial& fbxMaterial = geometry.materials[matid];
-        fbxMaterial._material = std::make_shared<graphics::Material>();
-        setFBXMaterial(fbxMaterial, _file.materials[i]);
+        geometry.materials[matid] = HFMMaterial();
+        HFMMaterial& hfmMaterial = geometry.materials[matid];
+        hfmMaterial._material = std::make_shared<graphics::Material>();
+        setHFMMaterial(hfmMaterial, _file.materials[i]);
     }
 
     
@@ -765,9 +765,9 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
         if (node.defined["mesh"]) {
             qCDebug(modelformat) << "node_transforms" << node.transforms;
             foreach(auto &primitive, _file.meshes[node.mesh].primitives) {
-                geometry.meshes.append(FBXMesh());
-                FBXMesh& mesh = geometry.meshes[geometry.meshes.size() - 1];
-                FBXCluster cluster;
+                geometry.meshes.append(HFMMesh());
+                HFMMesh& mesh = geometry.meshes[geometry.meshes.size() - 1];
+                HFMCluster cluster;
                 cluster.jointIndex = 0;
                 cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
                     0, 1, 0, 0,
@@ -775,7 +775,7 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
                     0, 0, 0, 1);
                 mesh.clusters.append(cluster);
 
-                FBXMeshPart part = FBXMeshPart();
+                HFMMeshPart part = HFMMeshPart();
 
                 int indicesAccessorIdx = primitive.indices;
 
@@ -910,7 +910,7 @@ bool GLTFReader::buildGeometry(FBXGeometry& geometry, const QUrl& url) {
     return true;
 }
 
-FBXGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping, 
+HFMGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping, 
                                   const QUrl& url, bool loadLightmaps, float lightmapLevel) {
     
     _url = url;
@@ -924,12 +924,12 @@ FBXGeometry* GLTFReader::readGLTF(QByteArray& model, const QVariantHash& mapping
 
     parseGLTF(model);
     //_file.dump();
-    FBXGeometry* geometryPtr = new FBXGeometry();
-    FBXGeometry& geometry = *geometryPtr;
+    HFMGeometry* geometryPtr = new HFMGeometry();
+    HFMGeometry& geometry = *geometryPtr;
 
     buildGeometry(geometry, url);
     
-    //fbxDebugDump(geometry);
+    //hfmDebugDump(geometry);
     return geometryPtr;
     
 }
@@ -997,8 +997,8 @@ QNetworkReply* GLTFReader::request(QUrl& url, bool isTest) {
     return netReply;                // trying to sync later on.
 }
 
-FBXTexture GLTFReader::getFBXTexture(const GLTFTexture& texture) {
-    FBXTexture fbxtex = FBXTexture();
+HFMTexture GLTFReader::getHFMTexture(const GLTFTexture& texture) {
+    HFMTexture fbxtex = HFMTexture();
     fbxtex.texcoordSet = 0;
     
     if (texture.defined["source"]) {
@@ -1014,7 +1014,7 @@ FBXTexture GLTFReader::getFBXTexture(const GLTFTexture& texture) {
     return fbxtex;
 }
 
-void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material) {
+void GLTFReader::setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material) {
 
 
     if (material.defined["name"]) {
@@ -1029,17 +1029,17 @@ void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& materia
     }
 
     if (material.defined["emissiveTexture"]) {
-        fbxmat.emissiveTexture = getFBXTexture(_file.textures[material.emissiveTexture]);
+        fbxmat.emissiveTexture = getHFMTexture(_file.textures[material.emissiveTexture]);
         fbxmat.useEmissiveMap = true;
     }
     
     if (material.defined["normalTexture"]) {
-        fbxmat.normalTexture = getFBXTexture(_file.textures[material.normalTexture]);
+        fbxmat.normalTexture = getHFMTexture(_file.textures[material.normalTexture]);
         fbxmat.useNormalMap = true;
     }
     
     if (material.defined["occlusionTexture"]) {
-        fbxmat.occlusionTexture = getFBXTexture(_file.textures[material.occlusionTexture]);
+        fbxmat.occlusionTexture = getHFMTexture(_file.textures[material.occlusionTexture]);
         fbxmat.useOcclusionMap = true;
     }
 
@@ -1050,14 +1050,14 @@ void GLTFReader::setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& materia
             fbxmat.metallic = material.pbrMetallicRoughness.metallicFactor;
         }
         if (material.pbrMetallicRoughness.defined["baseColorTexture"]) {
-            fbxmat.opacityTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
-            fbxmat.albedoTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
+            fbxmat.opacityTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
+            fbxmat.albedoTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.baseColorTexture]);
             fbxmat.useAlbedoMap = true;
         }
         if (material.pbrMetallicRoughness.defined["metallicRoughnessTexture"]) {
-            fbxmat.roughnessTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
+            fbxmat.roughnessTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
             fbxmat.useRoughnessMap = true;
-            fbxmat.metallicTexture = getFBXTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
+            fbxmat.metallicTexture = getHFMTexture(_file.textures[material.pbrMetallicRoughness.metallicRoughnessTexture]);
             fbxmat.useMetallicMap = true;
         }
         if (material.pbrMetallicRoughness.defined["roughnessFactor"]) {
@@ -1181,37 +1181,37 @@ void GLTFReader::retriangulate(const QVector<int>& inIndices, const QVector<glm:
     }
 }
 
-void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
-    qCDebug(modelformat) << "---------------- fbxGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
+void GLTFReader::hfmDebugDump(const HFMGeometry& hfmgeo) {
+    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
 
-    qCDebug(modelformat) << "  leftEyeJointIndex =" << fbxgeo.leftEyeJointIndex;
-    qCDebug(modelformat) << "  rightEyeJointIndex =" << fbxgeo.rightEyeJointIndex;
-    qCDebug(modelformat) << "  neckJointIndex =" << fbxgeo.neckJointIndex;
-    qCDebug(modelformat) << "  rootJointIndex =" << fbxgeo.rootJointIndex;
-    qCDebug(modelformat) << "  leanJointIndex =" << fbxgeo.leanJointIndex;
-    qCDebug(modelformat) << "  headJointIndex =" << fbxgeo.headJointIndex;
-    qCDebug(modelformat) << "  leftHandJointIndex" << fbxgeo.leftHandJointIndex;
-    qCDebug(modelformat) << "  rightHandJointIndex" << fbxgeo.rightHandJointIndex;
-    qCDebug(modelformat) << "  leftToeJointIndex" << fbxgeo.leftToeJointIndex;
-    qCDebug(modelformat) << "  rightToeJointIndex" << fbxgeo.rightToeJointIndex;
-    qCDebug(modelformat) << "  leftEyeSize = " << fbxgeo.leftEyeSize;
-    qCDebug(modelformat) << "  rightEyeSize = " << fbxgeo.rightEyeSize;
+    qCDebug(modelformat) << "  leftEyeJointIndex =" << hfmgeo.leftEyeJointIndex;
+    qCDebug(modelformat) << "  rightEyeJointIndex =" << hfmgeo.rightEyeJointIndex;
+    qCDebug(modelformat) << "  neckJointIndex =" << hfmgeo.neckJointIndex;
+    qCDebug(modelformat) << "  rootJointIndex =" << hfmgeo.rootJointIndex;
+    qCDebug(modelformat) << "  leanJointIndex =" << hfmgeo.leanJointIndex;
+    qCDebug(modelformat) << "  headJointIndex =" << hfmgeo.headJointIndex;
+    qCDebug(modelformat) << "  leftHandJointIndex" << hfmgeo.leftHandJointIndex;
+    qCDebug(modelformat) << "  rightHandJointIndex" << hfmgeo.rightHandJointIndex;
+    qCDebug(modelformat) << "  leftToeJointIndex" << hfmgeo.leftToeJointIndex;
+    qCDebug(modelformat) << "  rightToeJointIndex" << hfmgeo.rightToeJointIndex;
+    qCDebug(modelformat) << "  leftEyeSize = " << hfmgeo.leftEyeSize;
+    qCDebug(modelformat) << "  rightEyeSize = " << hfmgeo.rightEyeSize;
 
-    qCDebug(modelformat) << "  palmDirection = " << fbxgeo.palmDirection;
+    qCDebug(modelformat) << "  palmDirection = " << hfmgeo.palmDirection;
 
-    qCDebug(modelformat) << "  neckPivot = " << fbxgeo.neckPivot;
+    qCDebug(modelformat) << "  neckPivot = " << hfmgeo.neckPivot;
 
-    qCDebug(modelformat) << "  bindExtents.size() = " << fbxgeo.bindExtents.size();
-    qCDebug(modelformat) << "  meshExtents.size() = " << fbxgeo.meshExtents.size();
+    qCDebug(modelformat) << "  bindExtents.size() = " << hfmgeo.bindExtents.size();
+    qCDebug(modelformat) << "  meshExtents.size() = " << hfmgeo.meshExtents.size();
 
-    qCDebug(modelformat) << "  jointIndices.size() =" << fbxgeo.jointIndices.size();
-    qCDebug(modelformat) << "  joints.count() =" << fbxgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices.size() =" << hfmgeo.jointIndices.size();
+    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
     qCDebug(modelformat) << "---------------- Meshes ----------------";
-    qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
-    qCDebug(modelformat) << "  blendshapeChannelNames = " << fbxgeo.blendshapeChannelNames;
-    foreach(FBXMesh mesh, fbxgeo.meshes) {
+    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
+    qCDebug(modelformat) << "  blendshapeChannelNames = " << hfmgeo.blendshapeChannelNames;
+    foreach(HFMMesh mesh, hfmgeo.meshes) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    meshpointer =" << mesh._mesh.get();
         qCDebug(modelformat) << "    meshindex =" << mesh.meshIndex;
@@ -1227,7 +1227,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "    modelTransform =" << mesh.modelTransform;
         qCDebug(modelformat) << "    parts.count() =" << mesh.parts.count();
         qCDebug(modelformat) << "---------------- Meshes (blendshapes)--------";
-        foreach(FBXBlendshape bshape, mesh.blendshapes) {
+        foreach(HFMBlendshape bshape, mesh.blendshapes) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "    bshape.indices.count() =" << bshape.indices.count();
             qCDebug(modelformat) << "    bshape.vertices.count() =" << bshape.vertices.count();
@@ -1235,7 +1235,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
             qCDebug(modelformat) << "\n";
         }
         qCDebug(modelformat) << "---------------- Meshes (meshparts)--------";
-        foreach(FBXMeshPart meshPart, mesh.parts) {
+        foreach(HFMMeshPart meshPart, mesh.parts) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "        quadIndices.count() =" << meshPart.quadIndices.count();
             qCDebug(modelformat) << "        triangleIndices.count() =" << meshPart.triangleIndices.count();
@@ -1245,7 +1245,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         }
         qCDebug(modelformat) << "---------------- Meshes (clusters)--------";
         qCDebug(modelformat) << "    clusters.count() =" << mesh.clusters.count();
-        foreach(FBXCluster cluster, mesh.clusters) {
+        foreach(HFMCluster cluster, mesh.clusters) {
             qCDebug(modelformat) << "\n";
             qCDebug(modelformat) << "        jointIndex =" << cluster.jointIndex;
             qCDebug(modelformat) << "        inverseBindMatrix =" << cluster.inverseBindMatrix;
@@ -1254,18 +1254,18 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "\n";
     }
     qCDebug(modelformat) << "---------------- AnimationFrames ----------------";
-    foreach(FBXAnimationFrame anim, fbxgeo.animationFrames) {
+    foreach(HFMAnimationFrame anim, hfmgeo.animationFrames) {
         qCDebug(modelformat) << "  anim.translations = " << anim.translations;
         qCDebug(modelformat) << "  anim.rotations = " << anim.rotations;
     }
-    QList<int> mitomona_keys = fbxgeo.meshIndicesToModelNames.keys();
+    QList<int> mitomona_keys = hfmgeo.meshIndicesToModelNames.keys();
     foreach(int key, mitomona_keys) {
-        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << fbxgeo.meshIndicesToModelNames[key];
+        qCDebug(modelformat) << "    meshIndicesToModelNames key =" << key << "  val =" << hfmgeo.meshIndicesToModelNames[key];
     }
 
     qCDebug(modelformat) << "---------------- Materials ----------------";
 
-    foreach(FBXMaterial mat, fbxgeo.materials) {
+    foreach(HFMMaterial mat, hfmgeo.materials) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "  mat.materialID =" << mat.materialID;
         qCDebug(modelformat) << "  diffuseColor =" << mat.diffuseColor;
@@ -1314,7 +1314,7 @@ void GLTFReader::fbxDebugDump(const FBXGeometry& fbxgeo) {
 
     qCDebug(modelformat) << "---------------- Joints ----------------";
 
-    foreach(FBXJoint joint, fbxgeo.joints) {
+    foreach(HFMJoint joint, hfmgeo.joints) {
         qCDebug(modelformat) << "\n";
         qCDebug(modelformat) << "    shapeInfo.avgPoint =" << joint.shapeInfo.avgPoint;
         qCDebug(modelformat) << "    shapeInfo.debugLines =" << joint.shapeInfo.debugLines;
diff --git a/libraries/fbx/src/GLTFReader.h b/libraries/fbx/src/GLTFReader.h
index 2183256b87..17229c3554 100644
--- a/libraries/fbx/src/GLTFReader.h
+++ b/libraries/fbx/src/GLTFReader.h
@@ -706,7 +706,7 @@ class GLTFReader : public QObject {
     Q_OBJECT
 public:
     GLTFReader();
-    FBXGeometry* readGLTF(QByteArray& model, const QVariantHash& mapping, 
+    HFMGeometry* readGLTF(QByteArray& model, const QVariantHash& mapping, 
                           const QUrl& url, bool loadLightmaps = true, float lightmapLevel = 1.0f);
 private:
     GLTFFile _file;
@@ -714,7 +714,7 @@ private:
 
     glm::mat4 getModelTransform(const GLTFNode& node);
 
-    bool buildGeometry(FBXGeometry& geometry, const QUrl& url);
+    bool buildGeometry(HFMGeometry& geometry, const QUrl& url);
     bool parseGLTF(const QByteArray& model);
     
     bool getStringVal(const QJsonObject& object, const QString& fieldname, 
@@ -778,9 +778,9 @@ private:
     bool doesResourceExist(const QString& url);
 
 
-    void setFBXMaterial(FBXMaterial& fbxmat, const GLTFMaterial& material);
-    FBXTexture getFBXTexture(const GLTFTexture& texture);
-    void fbxDebugDump(const FBXGeometry& fbxgeo);
+    void setHFMMaterial(HFMMaterial& fbxmat, const GLTFMaterial& material);
+    HFMTexture getHFMTexture(const GLTFTexture& texture);
+    void hfmDebugDump(const HFMGeometry& hfmgeo);
 };
 
 #endif // hifi_GLTFReader_h
\ No newline at end of file
diff --git a/libraries/fbx/src/OBJReader.cpp b/libraries/fbx/src/OBJReader.cpp
index 7a2cbff497..fcfef5fe01 100644
--- a/libraries/fbx/src/OBJReader.cpp
+++ b/libraries/fbx/src/OBJReader.cpp
@@ -175,7 +175,7 @@ glm::vec2 OBJTokenizer::getVec2() {
 }
 
 
-void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID) {
+void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID) {
     meshPart.materialID = materialID;
 }
 
@@ -488,12 +488,12 @@ QNetworkReply* request(QUrl& url, bool isTest) {
 }
 
 
-bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
+bool OBJReader::parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
                               float& scaleGuess, bool combineParts) {
     FaceGroup faces;
-    FBXMesh& mesh = geometry.meshes[0];
-    mesh.parts.append(FBXMeshPart());
-    FBXMeshPart& meshPart = mesh.parts.last();
+    HFMMesh& mesh = geometry.meshes[0];
+    mesh.parts.append(HFMMeshPart());
+    HFMMeshPart& meshPart = mesh.parts.last();
     bool sawG = false;
     bool result = true;
     int originalFaceCountForDebugging = 0;
@@ -652,13 +652,13 @@ done:
 }
 
 
-FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
+HFMGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url) {
     PROFILE_RANGE_EX(resource_parse, __FUNCTION__, 0xffff0000, nullptr);
     QBuffer buffer { &model };
     buffer.open(QIODevice::ReadOnly);
 
-    auto geometryPtr { std::make_shared<FBXGeometry>() };
-    FBXGeometry& geometry { *geometryPtr };
+    auto geometryPtr { std::make_shared<HFMGeometry>() };
+    HFMGeometry& geometry { *geometryPtr };
     OBJTokenizer tokenizer { &buffer };
     float scaleGuess = 1.0f;
 
@@ -666,14 +666,14 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
 
     _url = url;
     geometry.meshExtents.reset();
-    geometry.meshes.append(FBXMesh());
+    geometry.meshes.append(HFMMesh());
 
     try {
         // call parseOBJGroup as long as it's returning true.  Each successful call will
         // add a new meshPart to the geometry's single mesh.
         while (parseOBJGroup(tokenizer, mapping, geometry, scaleGuess, combineParts)) {}
 
-        FBXMesh& mesh = geometry.meshes[0];
+        HFMMesh& mesh = geometry.meshes[0];
         mesh.meshIndex = 0;
 
         geometry.joints.resize(1);
@@ -688,7 +688,7 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
 
         geometry.jointIndices["x"] = 1;
 
-        FBXCluster cluster;
+        HFMCluster cluster;
         cluster.jointIndex = 0;
         cluster.inverseBindMatrix = glm::mat4(1, 0, 0, 0,
             0, 1, 0, 0,
@@ -697,20 +697,20 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         mesh.clusters.append(cluster);
 
         QMap<QString, int> materialMeshIdMap;
-        QVector<FBXMeshPart> fbxMeshParts;
+        QVector<HFMMeshPart> hfmMeshParts;
         for (int i = 0, meshPartCount = 0; i < mesh.parts.count(); i++, meshPartCount++) {
-            FBXMeshPart& meshPart = mesh.parts[i];
+            HFMMeshPart& meshPart = mesh.parts[i];
             FaceGroup faceGroup = faceGroups[meshPartCount];
             bool specifiesUV = false;
             foreach(OBJFace face, faceGroup) {
                 // Go through all of the OBJ faces and determine the number of different materials necessary (each different material will be a unique mesh).
                 // NOTE (trent/mittens 3/30/17): this seems hardcore wasteful and is slowed down a bit by iterating through the face group twice, but it's the best way I've thought of to hack multi-material support in an OBJ into this pipeline.
                 if (!materialMeshIdMap.contains(face.materialName)) {
-                    // Create a new FBXMesh for this material mapping.
+                    // Create a new HFMMesh for this material mapping.
                     materialMeshIdMap.insert(face.materialName, materialMeshIdMap.count());
 
-                    fbxMeshParts.append(FBXMeshPart());
-                    FBXMeshPart& meshPartNew = fbxMeshParts.last();
+                    hfmMeshParts.append(HFMMeshPart());
+                    HFMMeshPart& meshPartNew = hfmMeshParts.last();
                     meshPartNew.quadIndices = QVector<int>(meshPart.quadIndices);                    // Copy over quad indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
                     meshPartNew.quadTrianglesIndices = QVector<int>(meshPart.quadTrianglesIndices); // Copy over quad triangulated indices [NOTE (trent/mittens, 4/3/17): Likely unnecessary since they go unused anyway].
                     meshPartNew.triangleIndices = QVector<int>(meshPart.triangleIndices);            // Copy over triangle indices.
@@ -745,14 +745,14 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         // clean up old mesh parts.
         int unmodifiedMeshPartCount = mesh.parts.count();
         mesh.parts.clear();
-        mesh.parts = QVector<FBXMeshPart>(fbxMeshParts);
+        mesh.parts = QVector<HFMMeshPart>(hfmMeshParts);
 
         for (int i = 0, meshPartCount = 0; i < unmodifiedMeshPartCount; i++, meshPartCount++) {
             FaceGroup faceGroup = faceGroups[meshPartCount];
 
             // Now that each mesh has been created with its own unique material mappings, fill them with data (vertex data is duplicated, face data is not).
             foreach(OBJFace face, faceGroup) {
-                FBXMeshPart& meshPart = mesh.parts[materialMeshIdMap[face.materialName]];
+                HFMMeshPart& meshPart = mesh.parts[materialMeshIdMap[face.materialName]];
 
                 glm::vec3 v0 = checked_at(vertices, face.vertexIndices[0]);
                 glm::vec3 v1 = checked_at(vertices, face.vertexIndices[1]);
@@ -824,7 +824,7 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         // Build the single mesh.
         FBXReader::buildModelMesh(mesh, url.toString());
 
-        // fbxDebugDump(geometry);
+        // hfmDebugDump(geometry);
     } catch(const std::exception& e) {
         qCDebug(modelformat) << "OBJ reader fail: " << e.what();
     }
@@ -885,38 +885,38 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         if (!objMaterial.used) {
             continue;
         }
-        geometry.materials[materialID] = FBXMaterial(objMaterial.diffuseColor,
+        geometry.materials[materialID] = HFMMaterial(objMaterial.diffuseColor,
                                                      objMaterial.specularColor,
                                                      objMaterial.emissiveColor,
                                                      objMaterial.shininess,
                                                      objMaterial.opacity);
-        FBXMaterial& fbxMaterial = geometry.materials[materialID];
-        fbxMaterial.materialID = materialID;
-        fbxMaterial._material = std::make_shared<graphics::Material>();
-        graphics::MaterialPointer modelMaterial = fbxMaterial._material;
+        HFMMaterial& hfmMaterial = geometry.materials[materialID];
+        hfmMaterial.materialID = materialID;
+        hfmMaterial._material = std::make_shared<graphics::Material>();
+        graphics::MaterialPointer modelMaterial = hfmMaterial._material;
 
         if (!objMaterial.diffuseTextureFilename.isEmpty()) {
-            fbxMaterial.albedoTexture.filename = objMaterial.diffuseTextureFilename;
+            hfmMaterial.albedoTexture.filename = objMaterial.diffuseTextureFilename;
         }
         if (!objMaterial.specularTextureFilename.isEmpty()) {
-            fbxMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
+            hfmMaterial.specularTexture.filename = objMaterial.specularTextureFilename;
         }
         if (!objMaterial.emissiveTextureFilename.isEmpty()) {
-            fbxMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
+            hfmMaterial.emissiveTexture.filename = objMaterial.emissiveTextureFilename;
         }
         if (!objMaterial.bumpTextureFilename.isEmpty()) {
-            fbxMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
-            fbxMaterial.normalTexture.isBumpmap = true;
-            fbxMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
+            hfmMaterial.normalTexture.filename = objMaterial.bumpTextureFilename;
+            hfmMaterial.normalTexture.isBumpmap = true;
+            hfmMaterial.bumpMultiplier = objMaterial.bumpTextureOptions.bumpMultiplier;
         }
         if (!objMaterial.opacityTextureFilename.isEmpty()) {
-            fbxMaterial.opacityTexture.filename = objMaterial.opacityTextureFilename;
+            hfmMaterial.opacityTexture.filename = objMaterial.opacityTextureFilename;
         }
 
-        modelMaterial->setEmissive(fbxMaterial.emissiveColor);
-        modelMaterial->setAlbedo(fbxMaterial.diffuseColor);
-        modelMaterial->setMetallic(glm::length(fbxMaterial.specularColor));
-        modelMaterial->setRoughness(graphics::Material::shininessToRoughness(fbxMaterial.shininess));
+        modelMaterial->setEmissive(hfmMaterial.emissiveColor);
+        modelMaterial->setAlbedo(hfmMaterial.diffuseColor);
+        modelMaterial->setMetallic(glm::length(hfmMaterial.specularColor));
+        modelMaterial->setRoughness(graphics::Material::shininessToRoughness(hfmMaterial.shininess));
 
         bool applyTransparency = false;
         bool applyShininess = false;
@@ -971,7 +971,7 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
         }      
 
         if (applyTransparency) {
-            fbxMaterial.opacity = std::max(fbxMaterial.opacity, ILLUMINATION_MODEL_MIN_OPACITY);
+            hfmMaterial.opacity = std::max(hfmMaterial.opacity, ILLUMINATION_MODEL_MIN_OPACITY);
         }
         if (applyShininess) {
             modelMaterial->setRoughness(ILLUMINATION_MODEL_APPLY_SHININESS);
@@ -985,18 +985,18 @@ FBXGeometry::Pointer OBJReader::readOBJ(QByteArray& model, const QVariantHash& m
             modelMaterial->setFresnel(glm::vec3(1.0f));
         }
 
-        modelMaterial->setOpacity(fbxMaterial.opacity);
+        modelMaterial->setOpacity(hfmMaterial.opacity);
     }
 
     return geometryPtr;
 }
 
-void fbxDebugDump(const FBXGeometry& fbxgeo) {
-    qCDebug(modelformat) << "---------------- fbxGeometry ----------------";
-    qCDebug(modelformat) << "  hasSkeletonJoints =" << fbxgeo.hasSkeletonJoints;
-    qCDebug(modelformat) << "  offset =" << fbxgeo.offset;
-    qCDebug(modelformat) << "  meshes.count() =" << fbxgeo.meshes.count();
-    foreach (FBXMesh mesh, fbxgeo.meshes) {
+void hfmDebugDump(const HFMGeometry& hfmgeo) {
+    qCDebug(modelformat) << "---------------- hfmGeometry ----------------";
+    qCDebug(modelformat) << "  hasSkeletonJoints =" << hfmgeo.hasSkeletonJoints;
+    qCDebug(modelformat) << "  offset =" << hfmgeo.offset;
+    qCDebug(modelformat) << "  meshes.count() =" << hfmgeo.meshes.count();
+    foreach (HFMMesh mesh, hfmgeo.meshes) {
         qCDebug(modelformat) << "    vertices.count() =" << mesh.vertices.count();
         qCDebug(modelformat) << "    colors.count() =" << mesh.colors.count();
         qCDebug(modelformat) << "    normals.count() =" << mesh.normals.count();
@@ -1014,7 +1014,7 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
         qCDebug(modelformat) << "    meshExtents =" << mesh.meshExtents;
         qCDebug(modelformat) << "    modelTransform =" << mesh.modelTransform;
         qCDebug(modelformat) << "    parts.count() =" << mesh.parts.count();
-        foreach (FBXMeshPart meshPart, mesh.parts) {
+        foreach (HFMMeshPart meshPart, mesh.parts) {
             qCDebug(modelformat) << "        quadIndices.count() =" << meshPart.quadIndices.count();
             qCDebug(modelformat) << "        triangleIndices.count() =" << meshPart.triangleIndices.count();
    /*
@@ -1031,16 +1031,16 @@ void fbxDebugDump(const FBXGeometry& fbxgeo) {
             */
         }
         qCDebug(modelformat) << "    clusters.count() =" << mesh.clusters.count();
-        foreach (FBXCluster cluster, mesh.clusters) {
+        foreach (HFMCluster cluster, mesh.clusters) {
             qCDebug(modelformat) << "        jointIndex =" << cluster.jointIndex;
             qCDebug(modelformat) << "        inverseBindMatrix =" << cluster.inverseBindMatrix;
         }
     }
 
-    qCDebug(modelformat) << "  jointIndices =" << fbxgeo.jointIndices;
-    qCDebug(modelformat) << "  joints.count() =" << fbxgeo.joints.count();
+    qCDebug(modelformat) << "  jointIndices =" << hfmgeo.jointIndices;
+    qCDebug(modelformat) << "  joints.count() =" << hfmgeo.joints.count();
 
-    foreach (FBXJoint joint, fbxgeo.joints) {
+    foreach (HFMJoint joint, hfmgeo.joints) {
         qCDebug(modelformat) << "    isFree =" << joint.isFree;
         qCDebug(modelformat) << "    freeLineage" << joint.freeLineage;
         qCDebug(modelformat) << "    parentIndex" << joint.parentIndex;
diff --git a/libraries/fbx/src/OBJReader.h b/libraries/fbx/src/OBJReader.h
index e432a3ea51..2eb039eba2 100644
--- a/libraries/fbx/src/OBJReader.h
+++ b/libraries/fbx/src/OBJReader.h
@@ -42,7 +42,7 @@ public:
     bool add(const QByteArray& vertexIndex, const QByteArray& textureIndex, const QByteArray& normalIndex,
              const QVector<glm::vec3>& vertices, const QVector<glm::vec3>& vertexColors);
     // Return a set of one or more OBJFaces from this one, in which each is just a triangle.
-    // Even though FBXMeshPart can handle quads, it would be messy to try to keep track of mixed-size faces, so we treat everything as triangles.
+    // Even though HFMMeshPart can handle quads, it would be messy to try to keep track of mixed-size faces, so we treat everything as triangles.
     QVector<OBJFace> triangulate();
 private:
     void addFrom(const OBJFace* face, int index);
@@ -54,7 +54,7 @@ public:
 }
 ;
 // Materials and references to material names can come in any order, and different mesh parts can refer to the same material.
-// Therefore it would get pretty hacky to try to use FBXMeshPart to store these as we traverse the files.
+// Therefore it would get pretty hacky to try to use HFMMeshPart to store these as we traverse the files.
 class OBJMaterial {
 public:
     float shininess;
@@ -87,13 +87,13 @@ public:
     QString currentMaterialName;
     QHash<QString, OBJMaterial> materials;
 
-    FBXGeometry::Pointer readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
+    HFMGeometry::Pointer readOBJ(QByteArray& model, const QVariantHash& mapping, bool combineParts, const QUrl& url = QUrl());
 
 private:
     QUrl _url;
 
     QHash<QByteArray, bool> librariesSeen;
-    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, FBXGeometry& geometry,
+    bool parseOBJGroup(OBJTokenizer& tokenizer, const QVariantHash& mapping, HFMGeometry& geometry,
                        float& scaleGuess, bool combineParts);
     void parseMaterialLibrary(QIODevice* device);
     void parseTextureLine(const QByteArray& textureLine, QByteArray& filename, OBJMaterialTextureOptions& textureOptions);
@@ -103,5 +103,5 @@ private:
 };
 
 // What are these utilities doing here? One is used by fbx loading code in VHACD Utils, and the other a general debugging utility.
-void setMeshPartDefaults(FBXMeshPart& meshPart, QString materialID);
-void fbxDebugDump(const FBXGeometry& fbxgeo);
+void setMeshPartDefaults(HFMMeshPart& meshPart, QString materialID);
+void hfmDebugDump(const HFMGeometry& hfmgeo);
diff --git a/libraries/model-networking/src/model-networking/ModelCache.cpp b/libraries/model-networking/src/model-networking/ModelCache.cpp
index e96815d391..a950e1df3c 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.cpp
+++ b/libraries/model-networking/src/model-networking/ModelCache.cpp
@@ -128,7 +128,7 @@ void GeometryMappingResource::downloadFinished(const QByteArray& data) {
 
 void GeometryMappingResource::onGeometryMappingLoaded(bool success) {
     if (success && _geometryResource) {
-        _fbxGeometry = _geometryResource->_fbxGeometry;
+        _hfmGeometry = _geometryResource->_hfmGeometry;
         _meshParts = _geometryResource->_meshParts;
         _meshes = _geometryResource->_meshes;
         _materials = _geometryResource->_materials;
@@ -193,38 +193,38 @@ void GeometryReader::run() {
                 _url.path().toLower().endsWith(".obj.gz") ||
                 _url.path().toLower().endsWith(".gltf"))) {
 
-            FBXGeometry::Pointer fbxGeometry;
+            HFMGeometry::Pointer hfmGeometry;
 
             if (_url.path().toLower().endsWith(".fbx")) {
-                fbxGeometry.reset(readFBX(_data, _mapping, _url.path()));
-                if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) {
+                hfmGeometry.reset(readFBX(_data, _mapping, _url.path()));
+                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported FBX version");
                 }
             } else if (_url.path().toLower().endsWith(".obj")) {
-                fbxGeometry = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
+                hfmGeometry = OBJReader().readOBJ(_data, _mapping, _combineParts, _url);
             } else if (_url.path().toLower().endsWith(".obj.gz")) {
                 QByteArray uncompressedData;
                 if (gunzip(_data, uncompressedData)){
-                    fbxGeometry = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
+                    hfmGeometry = OBJReader().readOBJ(uncompressedData, _mapping, _combineParts, _url);
                 } else {
                     throw QString("failed to decompress .obj.gz");
                 }
 
             } else if (_url.path().toLower().endsWith(".gltf")) {
                 std::shared_ptr<GLTFReader> glreader = std::make_shared<GLTFReader>();
-                fbxGeometry.reset(glreader->readGLTF(_data, _mapping, _url));
-                if (fbxGeometry->meshes.size() == 0 && fbxGeometry->joints.size() == 0) {
+                hfmGeometry.reset(glreader->readGLTF(_data, _mapping, _url));
+                if (hfmGeometry->meshes.size() == 0 && hfmGeometry->joints.size() == 0) {
                     throw QString("empty geometry, possibly due to an unsupported GLTF version");
                 }
             } else {
                 throw QString("unsupported format");
             }
 
-            // Add scripts to fbxgeometry
+            // Add scripts to hfmGeometry
             if (!_mapping.value(SCRIPT_FIELD).isNull()) {
                 QVariantList scripts = _mapping.values(SCRIPT_FIELD);
                 for (auto &script : scripts) {
-                    fbxGeometry->scripts.push_back(script.toString());
+                    hfmGeometry->scripts.push_back(script.toString());
                 }
             }
 
@@ -234,7 +234,7 @@ void GeometryReader::run() {
                 qCWarning(modelnetworking) << "Abandoning load of" << _url << "; could not get strong ref";
             } else {
                 QMetaObject::invokeMethod(resource.data(), "setGeometryDefinition",
-                    Q_ARG(FBXGeometry::Pointer, fbxGeometry));
+                    Q_ARG(HFMGeometry::Pointer, hfmGeometry));
             }
         } else {
             throw QString("url is invalid");
@@ -262,7 +262,7 @@ public:
     virtual void downloadFinished(const QByteArray& data) override;
 
 protected:
-    Q_INVOKABLE void setGeometryDefinition(FBXGeometry::Pointer fbxGeometry);
+    Q_INVOKABLE void setGeometryDefinition(HFMGeometry::Pointer hfmGeometry);
 
 private:
     QVariantHash _mapping;
@@ -277,13 +277,13 @@ void GeometryDefinitionResource::downloadFinished(const QByteArray& data) {
     QThreadPool::globalInstance()->start(new GeometryReader(_self, _effectiveBaseURL, _mapping, data, _combineParts));
 }
 
-void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxGeometry) {
+void GeometryDefinitionResource::setGeometryDefinition(HFMGeometry::Pointer hfmGeometry) {
     // Assume ownership of the geometry pointer
-    _fbxGeometry = fbxGeometry;
+    _hfmGeometry = hfmGeometry;
 
     // Copy materials
     QHash<QString, size_t> materialIDAtlas;
-    for (const FBXMaterial& material : _fbxGeometry->materials) {
+    for (const HFMMaterial& material : _hfmGeometry->materials) {
         materialIDAtlas[material.materialID] = _materials.size();
         _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
     }
@@ -291,11 +291,11 @@ void GeometryDefinitionResource::setGeometryDefinition(FBXGeometry::Pointer fbxG
     std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
     std::shared_ptr<GeometryMeshParts> parts = std::make_shared<GeometryMeshParts>();
     int meshID = 0;
-    for (const FBXMesh& mesh : _fbxGeometry->meshes) {
+    for (const HFMMesh& mesh : _hfmGeometry->meshes) {
         // Copy mesh pointers
         meshes->emplace_back(mesh._mesh);
         int partID = 0;
-        for (const FBXMeshPart& part : mesh.parts) {
+        for (const HFMMeshPart& part : mesh.parts) {
             // Construct local parts
             parts->push_back(std::make_shared<MeshPart>(meshID, partID, (int)materialIDAtlas[part.materialID]));
             partID++;
@@ -371,7 +371,7 @@ const QVariantMap Geometry::getTextures() const {
 
 // FIXME: The materials should only be copied when modified, but the Model currently caches the original
 Geometry::Geometry(const Geometry& geometry) {
-    _fbxGeometry = geometry._fbxGeometry;
+    _hfmGeometry = geometry._hfmGeometry;
     _meshes = geometry._meshes;
     _meshParts = geometry._meshParts;
 
@@ -444,8 +444,8 @@ void GeometryResource::deleter() {
 }
 
 void GeometryResource::setTextures() {
-    if (_fbxGeometry) {
-        for (const FBXMaterial& material : _fbxGeometry->materials) {
+    if (_hfmGeometry) {
+        for (const HFMMaterial& material : _hfmGeometry->materials) {
             _materials.push_back(std::make_shared<NetworkMaterial>(material, _textureBaseUrl));
         }
     }
@@ -512,7 +512,7 @@ const QString& NetworkMaterial::getTextureName(MapChannel channel) {
     return NO_TEXTURE;
 }
 
-QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const FBXTexture& texture) {
+QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const HFMTexture& texture) {
     if (texture.content.isEmpty()) {
         // External file: search relative to the baseUrl, in case filename is relative
         return baseUrl.resolved(QUrl(texture.filename));
@@ -529,22 +529,22 @@ QUrl NetworkMaterial::getTextureUrl(const QUrl& baseUrl, const FBXTexture& textu
     }
 }
 
-graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const FBXTexture& fbxTexture,
+graphics::TextureMapPointer NetworkMaterial::fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
                                                           image::TextureUsage::Type type, MapChannel channel) {
 
     if (baseUrl.isEmpty()) {
         return nullptr;
     }
 
-    const auto url = getTextureUrl(baseUrl, fbxTexture);
-    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, fbxTexture.content, fbxTexture.maxNumPixels);
-    _textures[channel] = Texture { fbxTexture.name, texture };
+    const auto url = getTextureUrl(baseUrl, hfmTexture);
+    const auto texture = DependencyManager::get<TextureCache>()->getTexture(url, type, hfmTexture.content, hfmTexture.maxNumPixels);
+    _textures[channel] = Texture { hfmTexture.name, texture };
 
     auto map = std::make_shared<graphics::TextureMap>();
     if (texture) {
         map->setTextureSource(texture->_textureSource);
     }
-    map->setTextureTransform(fbxTexture.transform);
+    map->setTextureTransform(hfmTexture.transform);
 
     return map;
 }
@@ -624,7 +624,7 @@ void NetworkMaterial::setLightmapMap(const QUrl& url) {
     }
 }
 
-NetworkMaterial::NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl) :
+NetworkMaterial::NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl) :
     graphics::Material(*material._material),
     _textures(MapChannel::NUM_MAP_CHANNELS)
 {
diff --git a/libraries/model-networking/src/model-networking/ModelCache.h b/libraries/model-networking/src/model-networking/ModelCache.h
index 5cbe96ea03..2283c355d8 100644
--- a/libraries/model-networking/src/model-networking/ModelCache.h
+++ b/libraries/model-networking/src/model-networking/ModelCache.h
@@ -45,9 +45,9 @@ public:
     // Mutable, but must retain structure of vector
     using NetworkMaterials = std::vector<std::shared_ptr<NetworkMaterial>>;
 
-    bool isGeometryLoaded() const { return (bool)_fbxGeometry; }
+    bool isGeometryLoaded() const { return (bool)_hfmGeometry; }
 
-    const FBXGeometry& getFBXGeometry() const { return *_fbxGeometry; }
+    const HFMGeometry& getHFMGeometry() const { return *_hfmGeometry; }
     const GeometryMeshes& getMeshes() const { return *_meshes; }
     const std::shared_ptr<NetworkMaterial> getShapeMaterial(int shapeID) const;
 
@@ -62,7 +62,7 @@ protected:
     friend class GeometryMappingResource;
 
     // Shared across all geometries, constant throughout lifetime
-    std::shared_ptr<const FBXGeometry> _fbxGeometry;
+    std::shared_ptr<const HFMGeometry> _hfmGeometry;
     std::shared_ptr<const GeometryMeshes> _meshes;
     std::shared_ptr<const GeometryMeshParts> _meshParts;
 
@@ -94,7 +94,7 @@ protected:
 
     // Geometries may not hold onto textures while cached - that is for the texture cache
     // Instead, these methods clear and reset textures from the geometry when caching/loading
-    bool shouldSetTextures() const { return _fbxGeometry && _materials.empty(); }
+    bool shouldSetTextures() const { return _hfmGeometry && _materials.empty(); }
     void setTextures();
     void resetTextures();
 
@@ -165,7 +165,7 @@ public:
     using MapChannel = graphics::Material::MapChannel;
 
     NetworkMaterial() : _textures(MapChannel::NUM_MAP_CHANNELS) {}
-    NetworkMaterial(const FBXMaterial& material, const QUrl& textureBaseUrl);
+    NetworkMaterial(const HFMMaterial& material, const QUrl& textureBaseUrl);
     NetworkMaterial(const NetworkMaterial& material);
 
     void setAlbedoMap(const QUrl& url, bool useAlphaChannel);
@@ -201,8 +201,8 @@ protected:
 
 private:
     // Helpers for the ctors
-    QUrl getTextureUrl(const QUrl& baseUrl, const FBXTexture& fbxTexture);
-    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const FBXTexture& fbxTexture,
+    QUrl getTextureUrl(const QUrl& baseUrl, const HFMTexture& hfmTexture);
+    graphics::TextureMapPointer fetchTextureMap(const QUrl& baseUrl, const HFMTexture& hfmTexture,
                                              image::TextureUsage::Type type, MapChannel channel);
     graphics::TextureMapPointer fetchTextureMap(const QUrl& url, image::TextureUsage::Type type, MapChannel channel);
 
diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 81a017a46d..31d6cef060 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -32,8 +32,8 @@ bool CauterizedModel::updateGeometry() {
     bool needsFullUpdate = Model::updateGeometry();
     if (_isCauterized && needsFullUpdate) {
         assert(_cauterizeMeshStates.empty());
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
-        foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
+        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
             Model::MeshState state;
             if (_useDualQuaternionSkinning) {
                 state.clusterDualQuaternions.resize(mesh.clusters.size());
@@ -76,7 +76,7 @@ void CauterizedModel::createRenderItemSet() {
         // Run through all of the meshes, and place them into their segregated, but unsorted buckets
         int shapeID = 0;
         uint32_t numMeshes = (uint32_t)meshes.size();
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
         for (uint32_t i = 0; i < numMeshes; i++) {
             const auto& mesh = meshes.at(i);
             if (!mesh) {
@@ -86,7 +86,7 @@ void CauterizedModel::createRenderItemSet() {
             // Create the render payloads
             int numParts = (int)mesh->getNumParts();
             for (int partIndex = 0; partIndex < numParts; partIndex++) {
-                initializeBlendshapes(fbxGeometry.meshes[i], i);
+                initializeBlendshapes(hfmGeometry.meshes[i], i);
 
                 auto ptr = std::make_shared<CauterizedMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
                 _modelMeshRenderItems << std::static_pointer_cast<ModelMeshPartPayload>(ptr);
@@ -109,13 +109,13 @@ void CauterizedModel::updateClusterMatrices() {
         return;
     }
     _needsUpdateClusterMatrices = false;
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     for (int i = 0; i < (int)_meshStates.size(); i++) {
         Model::MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
                 auto jointPose = _rig.getJointPose(cluster.jointIndex);
                 Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
@@ -145,10 +145,10 @@ void CauterizedModel::updateClusterMatrices() {
 
         for (int i = 0; i < _cauterizeMeshStates.size(); i++) {
             Model::MeshState& state = _cauterizeMeshStates[i];
-            const FBXMesh& mesh = geometry.meshes.at(i);
+            const HFMMesh& mesh = geometry.meshes.at(i);
 
             for (int j = 0; j < mesh.clusters.size(); j++) {
-                const FBXCluster& cluster = mesh.clusters.at(j);
+                const HFMCluster& cluster = mesh.clusters.at(j);
 
                 if (_useDualQuaternionSkinning) {
                     if (_cauterizeBoneSet.find(cluster.jointIndex) == _cauterizeBoneSet.end()) {
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index 4ebd92bb05..8e2541fdda 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -260,8 +260,8 @@ void ModelMeshPartPayload::initCache(const ModelPointer& model) {
         _hasColorAttrib = vertexFormat->hasAttribute(gpu::Stream::COLOR);
         _isSkinned = vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_WEIGHT) && vertexFormat->hasAttribute(gpu::Stream::SKIN_CLUSTER_INDEX);
 
-        const FBXGeometry& geometry = model->getFBXGeometry();
-        const FBXMesh& mesh = geometry.meshes.at(_meshIndex);
+        const HFMGeometry& geometry = model->getHFMGeometry();
+        const HFMMesh& mesh = geometry.meshes.at(_meshIndex);
 
         _isBlendShaped = !mesh.blendshapes.isEmpty();
         _hasTangents = !mesh.tangents.isEmpty();
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 53009e8bfa..65b3fef7c0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -183,7 +183,7 @@ bool Model::shouldInvalidatePayloadShapeKey(int meshIndex) {
         return true;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     const auto& networkMeshes = getGeometry()->getMeshes();
     // if our index is ever out of range for either meshes or networkMeshes, then skip it, and set our _meshGroupsKnown
     // to false to rebuild out mesh groups.
@@ -278,7 +278,7 @@ void Model::setRenderItemsNeedUpdate() {
 
 void Model::reset() {
     if (isLoaded()) {
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         _rig.reset(geometry);
         emit rigReset();
         emit rigReady();
@@ -295,13 +295,13 @@ bool Model::updateGeometry() {
     _needsReload = false;
 
     // TODO: should all Models have a valid _rig?
-    if (_rig.jointStatesEmpty() && getFBXGeometry().joints.size() > 0) {
+    if (_rig.jointStatesEmpty() && getHFMGeometry().joints.size() > 0) {
         initJointStates();
         assert(_meshStates.empty());
 
-        const FBXGeometry& fbxGeometry = getFBXGeometry();
+        const HFMGeometry& hfmGeometry = getHFMGeometry();
         int i = 0;
-        foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
+        foreach (const HFMMesh& mesh, hfmGeometry.meshes) {
             MeshState state;
             state.clusterDualQuaternions.resize(mesh.clusters.size());
             state.clusterMatrices.resize(mesh.clusters.size());
@@ -319,7 +319,7 @@ bool Model::updateGeometry() {
 
 // virtual
 void Model::initJointStates() {
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     glm::mat4 modelOffset = glm::scale(_scale) * glm::translate(_offset);
 
     _rig.initJointStates(geometry, modelOffset);
@@ -363,7 +363,7 @@ bool Model::findRayIntersectionAgainstSubMeshes(const glm::vec3& origin, const g
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         if (!_triangleSetsValid) {
             calculateTriangleSets(geometry);
         }
@@ -506,7 +506,7 @@ bool Model::findParabolaIntersectionAgainstSubMeshes(const glm::vec3& origin, co
         int bestShapeID = 0;
         int bestSubMeshIndex = 0;
 
-        const FBXGeometry& geometry = getFBXGeometry();
+        const HFMGeometry& geometry = getHFMGeometry();
         if (!_triangleSetsValid) {
             calculateTriangleSets(geometry);
         }
@@ -641,7 +641,7 @@ bool Model::convexHullContains(glm::vec3 point) {
         QMutexLocker locker(&_mutex);
 
         if (!_triangleSetsValid) {
-            calculateTriangleSets(getFBXGeometry());
+            calculateTriangleSets(getHFMGeometry());
         }
 
         // If we are inside the models box, then consider the submeshes...
@@ -753,14 +753,14 @@ bool Model::replaceScriptableModelMeshPart(scriptable::ScriptableModelBasePointe
     }
     // update triangles for picking
     {
-        FBXGeometry geometry;
+        HFMGeometry geometry;
         for (const auto& newMesh : meshes) {
-            FBXMesh mesh;
+            HFMMesh mesh;
             mesh._mesh = newMesh.getMeshPointer();
             mesh.vertices = buffer_helpers::mesh::attributeToVector<glm::vec3>(mesh._mesh, gpu::Stream::POSITION);
             int numParts = (int)newMesh.getMeshPointer()->getNumParts();
             for (int partID = 0; partID < numParts; partID++) {
-                FBXMeshPart part;
+                HFMMeshPart part;
                 part.triangleIndices = buffer_helpers::bufferToVector<int>(mesh._mesh->getIndexBuffer(), "part.triangleIndices");
                 mesh.parts << part;
             }
@@ -789,12 +789,12 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
         return result;
     }
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     int numberOfMeshes = geometry.meshes.size();
     int shapeID = 0;
     for (int i = 0; i < numberOfMeshes; i++) {
-        const FBXMesh& fbxMesh = geometry.meshes.at(i);
-        if (auto mesh = fbxMesh._mesh) {
+        const HFMMesh& hfmMesh = geometry.meshes.at(i);
+        if (auto mesh = hfmMesh._mesh) {
             result.append(mesh);
 
             int numParts = (int)mesh->getNumParts();
@@ -808,7 +808,7 @@ scriptable::ScriptableModelBase Model::getScriptableModel() {
     return result;
 }
 
-void Model::calculateTriangleSets(const FBXGeometry& geometry) {
+void Model::calculateTriangleSets(const HFMGeometry& geometry) {
     PROFILE_RANGE(render, __FUNCTION__);
 
     int numberOfMeshes = geometry.meshes.size();
@@ -818,14 +818,14 @@ void Model::calculateTriangleSets(const FBXGeometry& geometry) {
     _modelSpaceMeshTriangleSets.resize(numberOfMeshes);
 
     for (int i = 0; i < numberOfMeshes; i++) {
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
 
         const int numberOfParts = mesh.parts.size();
         auto& meshTriangleSets = _modelSpaceMeshTriangleSets[i];
         meshTriangleSets.resize(numberOfParts);
 
         for (int j = 0; j < numberOfParts; j++) {
-            const FBXMeshPart& part = mesh.parts.at(j);
+            const HFMMeshPart& part = mesh.parts.at(j);
 
             auto& partTriangleSet = meshTriangleSets[j];
 
@@ -1114,7 +1114,7 @@ Extents Model::getBindExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& bindExtents = getFBXGeometry().bindExtents;
+    const Extents& bindExtents = getHFMGeometry().bindExtents;
     Extents scaledExtents = { bindExtents.minimum * _scale, bindExtents.maximum * _scale };
     return scaledExtents;
 }
@@ -1128,12 +1128,12 @@ Extents Model::getMeshExtents() const {
     if (!isActive()) {
         return Extents();
     }
-    const Extents& extents = getFBXGeometry().meshExtents;
+    const Extents& extents = getHFMGeometry().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum * _scale, maximum * _scale };
     return scaledExtents;
 }
@@ -1143,12 +1143,12 @@ Extents Model::getUnscaledMeshExtents() const {
         return Extents();
     }
 
-    const Extents& extents = getFBXGeometry().meshExtents;
+    const Extents& extents = getHFMGeometry().meshExtents;
 
     // even though our caller asked for "unscaled" we need to include any fst scaling, translation, and rotation, which
     // is captured in the offset matrix
-    glm::vec3 minimum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.minimum, 1.0f));
-    glm::vec3 maximum = glm::vec3(getFBXGeometry().offset * glm::vec4(extents.maximum, 1.0f));
+    glm::vec3 minimum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.minimum, 1.0f));
+    glm::vec3 maximum = glm::vec3(getHFMGeometry().offset * glm::vec4(extents.maximum, 1.0f));
     Extents scaledExtents = { minimum, maximum };
 
     return scaledExtents;
@@ -1171,11 +1171,11 @@ void Model::setJointTranslation(int index, bool valid, const glm::vec3& translat
 }
 
 int Model::getParentJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getFBXGeometry().joints.at(jointIndex).parentIndex : -1;
+    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).parentIndex : -1;
 }
 
 int Model::getLastFreeJointIndex(int jointIndex) const {
-    return (isActive() && jointIndex != -1) ? getFBXGeometry().joints.at(jointIndex).freeLineage.last() : -1;
+    return (isActive() && jointIndex != -1) ? getHFMGeometry().joints.at(jointIndex).freeLineage.last() : -1;
 }
 
 void Model::setTextures(const QVariantMap& textures) {
@@ -1275,7 +1275,7 @@ QStringList Model::getJointNames() const {
             Q_RETURN_ARG(QStringList, result));
         return result;
     }
-    return isActive() ? getFBXGeometry().getJointNames() : QStringList();
+    return isActive() ? getHFMGeometry().getJointNames() : QStringList();
 }
 
 void Model::setScaleToFit(bool scaleToFit, const glm::vec3& dimensions, bool forceRescale) {
@@ -1415,12 +1415,12 @@ void Model::updateClusterMatrices() {
     }
 
     _needsUpdateClusterMatrices = false;
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
             if (_useDualQuaternionSkinning) {
                 auto jointPose = _rig.getJointPose(cluster.jointIndex);
                 Transform jointTransform(jointPose.rot(), jointPose.scale(), jointPose.trans());
@@ -1505,7 +1505,7 @@ void Model::createRenderItemSet() {
     // Run through all of the meshes, and place them into their segregated, but unsorted buckets
     int shapeID = 0;
     uint32_t numMeshes = (uint32_t)meshes.size();
-    auto& fbxGeometry = getFBXGeometry();
+    auto& hfmGeometry = getHFMGeometry();
     for (uint32_t i = 0; i < numMeshes; i++) {
         const auto& mesh = meshes.at(i);
         if (!mesh) {
@@ -1515,7 +1515,7 @@ void Model::createRenderItemSet() {
         // Create the render payloads
         int numParts = (int)mesh->getNumParts();
         for (int partIndex = 0; partIndex < numParts; partIndex++) {
-            initializeBlendshapes(fbxGeometry.meshes[i], i);
+            initializeBlendshapes(hfmGeometry.meshes[i], i);
             _modelMeshRenderItems << std::make_shared<ModelMeshPartPayload>(shared_from_this(), i, partIndex, shapeID, transform, offset);
             auto material = getGeometry()->getShapeMaterial(shapeID);
             _modelMeshMaterialNames.push_back(material ? material->getName() : "");
@@ -1600,7 +1600,7 @@ void Model::removeMaterial(graphics::MaterialPointer material, const std::string
 class CollisionRenderGeometry : public Geometry {
 public:
     CollisionRenderGeometry(graphics::MeshPointer mesh) {
-        _fbxGeometry = std::make_shared<FBXGeometry>();
+        _hfmGeometry = std::make_shared<HFMGeometry>();
         std::shared_ptr<GeometryMeshes> meshes = std::make_shared<GeometryMeshes>();
         meshes->push_back(mesh);
         _meshes = meshes;
@@ -1656,9 +1656,9 @@ void Blender::run() {
     if (_model && _model->isLoaded()) {
         DETAILED_PROFILE_RANGE_EX(simulation_animation, __FUNCTION__, 0xFFFF0000, 0, { { "url", _model->getURL().toString() } });
         int offset = 0;
-        auto meshes = _model->getFBXGeometry().meshes;
+        auto meshes = _model->getHFMGeometry().meshes;
         int meshIndex = 0;
-        foreach(const FBXMesh& mesh, meshes) {
+        foreach(const HFMMesh& mesh, meshes) {
             auto modelMeshBlendshapeOffsets = _model->_blendshapeOffsets.find(meshIndex++);
             if (mesh.blendshapes.isEmpty() || modelMeshBlendshapeOffsets == _model->_blendshapeOffsets.end()) {
                 // Not blendshaped or not initialized
@@ -1688,7 +1688,7 @@ void Blender::run() {
                 }
 
                 float normalCoefficient = vertexCoefficient * NORMAL_COEFFICIENT_SCALE;
-                const FBXBlendshape& blendshape = mesh.blendshapes.at(i);
+                const HFMBlendshape& blendshape = mesh.blendshapes.at(i);
 
                 tbb::parallel_for(tbb::blocked_range<int>(0, blendshape.indices.size()), [&](const tbb::blocked_range<int>& range) {
                     for (auto j = range.begin(); j < range.end(); j++) {
@@ -1731,7 +1731,7 @@ bool Model::maybeStartBlender() {
     return false;
 }
 
-void Model::initializeBlendshapes(const FBXMesh& mesh, int index) {
+void Model::initializeBlendshapes(const HFMMesh& mesh, int index) {
     if (mesh.blendshapes.empty()) {
         // mesh doesn't have blendshape, did we allocate one though ?
         if (_blendshapeOffsets.find(index) != _blendshapeOffsets.end()) {
diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h
index 71809821eb..db5625b3d8 100644
--- a/libraries/render-utils/src/Model.h
+++ b/libraries/render-utils/src/Model.h
@@ -185,7 +185,7 @@ public:
 
     /// Provided as a convenience, will crash if !isLoaded()
     // And so that getGeometry() isn't chained everywhere
-    const FBXGeometry& getFBXGeometry() const { assert(isLoaded()); return _renderGeometry->getFBXGeometry(); }
+    const HFMGeometry& getHFMGeometry() const { assert(isLoaded()); return _renderGeometry->getHFMGeometry(); }
 
     bool isActive() const { return isLoaded(); }
 
@@ -450,7 +450,7 @@ protected:
 
     bool _overrideModelTransform { false };
     bool _triangleSetsValid { false };
-    void calculateTriangleSets(const FBXGeometry& geometry);
+    void calculateTriangleSets(const HFMGeometry& geometry);
     std::vector<std::vector<TriangleSet>> _modelSpaceMeshTriangleSets; // model space triangles for all sub meshes
 
     virtual void createRenderItemSet();
@@ -506,7 +506,7 @@ protected:
 
     bool shouldInvalidatePayloadShapeKey(int meshIndex);
 
-    void initializeBlendshapes(const FBXMesh& mesh, int index);
+    void initializeBlendshapes(const HFMMesh& mesh, int index);
 
 private:
     float _loadingPriority { 0.0f };
diff --git a/libraries/render-utils/src/SoftAttachmentModel.cpp b/libraries/render-utils/src/SoftAttachmentModel.cpp
index 90015768d0..77b09caa1d 100644
--- a/libraries/render-utils/src/SoftAttachmentModel.cpp
+++ b/libraries/render-utils/src/SoftAttachmentModel.cpp
@@ -41,14 +41,14 @@ void SoftAttachmentModel::updateClusterMatrices() {
 
     _needsUpdateClusterMatrices = false;
 
-    const FBXGeometry& geometry = getFBXGeometry();
+    const HFMGeometry& geometry = getHFMGeometry();
 
     for (int i = 0; i < (int) _meshStates.size(); i++) {
         MeshState& state = _meshStates[i];
-        const FBXMesh& mesh = geometry.meshes.at(i);
+        const HFMMesh& mesh = geometry.meshes.at(i);
 
         for (int j = 0; j < mesh.clusters.size(); j++) {
-            const FBXCluster& cluster = mesh.clusters.at(j);
+            const HFMCluster& cluster = mesh.clusters.at(j);
 
             // TODO: cache these look-ups as an optimization
             int jointIndexOverride = getJointIndexOverride(cluster.jointIndex);
diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index 4fb7ddd40b..f9857992bb 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -18,7 +18,7 @@ Script.include("/~/system/libraries/accountUtils.js");
 Script.include("/~/system/libraries/connectionUtils.js");
 var AppUi = Script.require('appUi');
 
-    var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";;
+var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace";
 
 // BEGIN AVATAR SELECTOR LOGIC
 var UNSELECTED_COLOR = { red: 0x1F, green: 0xC6, blue: 0xA6 };
@@ -607,13 +607,13 @@ function notificationPollCallbackHistory(historyArray) {
         if (notificationCount > 0) {
             var message;
             if (!ui.notificationInitialCallbackMade[1]) {
-                message = "You have " + notificationCount + " unread wallet " +
-                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open WALLET to see all activity.";
+                message = "You have " + notificationCount + " unread recent " +
+                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open ASSETS to see all activity.";
                 ui.notificationDisplayBanner(message);
             } else {
                 for (var i = 0; i < notificationCount; i++) {
                     message = '"' + (historyArray[i].message) + '" ' +
-                        "Open WALLET to see all activity.";
+                        "Open ASSETS to see all activity.";
                     ui.notificationDisplayBanner(message);
                 }
             }
diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js
index ed8ed9f288..8bfd776971 100644
--- a/scripts/system/marketplaces/marketplaces.js
+++ b/scripts/system/marketplaces/marketplaces.js
@@ -527,7 +527,13 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
             Window.location = "hifi://BankOfHighFidelity";
         }
         break;
-    case 'checkout_openWallet':
+    case 'checkout_openRecentActivity':
+        ui.open(MARKETPLACE_WALLET_QML_PATH);
+        wireQmlEventBridge(true);
+        ui.tablet.sendToQml({
+            method: 'checkout_openRecentActivity'
+        });
+        break;
     case 'checkout_setUpClicked':
         openWallet();
         break;
@@ -589,9 +595,6 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
         break;
     case 'updateItemClicked':
         openMarketplace(message.upgradeUrl + "?edition=" + message.itemEdition);
-        break;
-    case 'giftAsset':
-
         break;
     case 'passphrasePopup_cancelClicked':
     case 'needsLogIn_cancelClicked':
@@ -635,6 +638,20 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
     case 'http.request':
         // Handled elsewhere, don't log.
         break;
+    // All of these are handled by wallet.js
+    case 'purchases_updateWearables':
+    case 'enable_ChooseRecipientNearbyMode':
+    case 'disable_ChooseRecipientNearbyMode':
+    case 'sendAsset_sendPublicly':
+    case 'refreshConnections':
+    case 'transactionHistory_goToBank':
+    case 'purchases_walletNotSetUp':
+    case 'purchases_openGoTo':
+    case 'purchases_itemInfoClicked':
+    case 'purchases_itemCertificateClicked':
+        case 'clearShouldShowDotHistory':
+        case 'giftAsset':
+        break;
     default:
         print('Unrecognized message from Checkout.qml: ' + JSON.stringify(message));
     }
@@ -705,6 +722,8 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
             referrerURL: referrerURL,
             filterText: filterText
         });
+        referrerURL = "";
+        filterText = "";
     }
 
     ui.isOpen = (onMarketplaceScreen || onCommerceScreen) && !onWalletScreen;
diff --git a/tests-manual/gpu/src/TestFbx.cpp b/tests-manual/gpu/src/TestFbx.cpp
index 538bb0a973..9890e4fbe7 100644
--- a/tests-manual/gpu/src/TestFbx.cpp
+++ b/tests-manual/gpu/src/TestFbx.cpp
@@ -100,12 +100,12 @@ bool TestFbx::isReady() const {
 
 void TestFbx::parseFbx(const QByteArray& fbxData) {
     QVariantHash mapping;
-    FBXGeometry* fbx = readFBX(fbxData, mapping);
+    HFMGeometry* geometry = readFBX(fbxData, mapping);
     size_t totalVertexCount = 0;
     size_t totalIndexCount = 0;
     size_t totalPartCount = 0;
     size_t highestIndex = 0;
-    for (const auto& mesh : fbx->meshes) {
+    for (const auto& mesh : geometry->meshes) {
         size_t vertexCount = mesh.vertices.size();
         totalVertexCount += mesh.vertices.size();
         highestIndex = std::max(highestIndex, vertexCount);
@@ -123,7 +123,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     std::vector<DrawElementsIndirectCommand> parts;
     parts.reserve(totalPartCount);
     _partCount = totalPartCount;
-    for (const auto& mesh : fbx->meshes) {
+    for (const auto& mesh : geometry->meshes) {
         baseVertex = vertices.size();
 
         vec3 color;
@@ -133,7 +133,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
             partIndirect.firstIndex = (uint)indices.size();
             partIndirect.baseInstance = (uint)parts.size();
             _partTransforms.push_back(mesh.modelTransform);
-            auto material = fbx->materials[part.materialID];
+            auto material = geometry->materials[part.materialID];
             color = material.diffuseColor;
             for (auto index : part.quadTrianglesIndices) {
                 indices.push_back(index);
@@ -163,7 +163,7 @@ void TestFbx::parseFbx(const QByteArray& fbxData) {
     _vertexBuffer->append(vertices);
     _indexBuffer->append(indices);
     _indirectBuffer->append(parts);
-    delete fbx;
+    delete geometry;
 }
 
 void TestFbx::renderTest(size_t testId, RenderArgs* args) {
diff --git a/tests-manual/gpu/src/TestFbx.h b/tests-manual/gpu/src/TestFbx.h
index 391fff1091..4e22928460 100644
--- a/tests-manual/gpu/src/TestFbx.h
+++ b/tests-manual/gpu/src/TestFbx.h
@@ -11,7 +11,7 @@
 
 #include <render/ShapePipeline.h>
 
-class FBXGeometry;
+class HFMGeometry;
 
 class TestFbx : public GpuTestBase {
     size_t _partCount { 0 };
diff --git a/tests/animation/src/AnimInverseKinematicsTests.cpp b/tests/animation/src/AnimInverseKinematicsTests.cpp
index f5d3597f56..f51fe12ecb 100644
--- a/tests/animation/src/AnimInverseKinematicsTests.cpp
+++ b/tests/animation/src/AnimInverseKinematicsTests.cpp
@@ -28,8 +28,8 @@ const glm::quat identity = glm::quat();
 const glm::quat quaterTurnAroundZ = glm::angleAxis(0.5f * PI, zAxis);
 
 
-void makeTestFBXJoints(FBXGeometry& geometry) {
-    FBXJoint joint;
+void makeTestFBXJoints(HFMGeometry& geometry) {
+    HFMJoint joint;
     joint.isFree = false;
     joint.freeLineage.clear();
     joint.parentIndex = -1;
@@ -79,7 +79,7 @@ void makeTestFBXJoints(FBXGeometry& geometry) {
 
     // compute each joint's transform
     for (int i = 1; i < (int)geometry.joints.size(); ++i) {
-        FBXJoint& j = geometry.joints[i];
+        HFMJoint& j = geometry.joints[i];
         int parentIndex = j.parentIndex;
         // World = ParentWorld * T * (Roff * Rp) * Rpre * R * Rpost * (Rp-1 * Soff * Sp * S * Sp-1)
         j.transform = geometry.joints[parentIndex].transform *
@@ -96,7 +96,7 @@ void AnimInverseKinematicsTests::testSingleChain() {
 
     AnimContext context(false, false, false, glm::mat4(), glm::mat4());
 
-    FBXGeometry geometry;
+    HFMGeometry geometry;
     makeTestFBXJoints(geometry);
 
     // create a skeleton and doll
diff --git a/tools/skeleton-dump/src/SkeletonDumpApp.cpp b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
index e9d8243e38..5107931da1 100644
--- a/tools/skeleton-dump/src/SkeletonDumpApp.cpp
+++ b/tools/skeleton-dump/src/SkeletonDumpApp.cpp
@@ -54,8 +54,8 @@ SkeletonDumpApp::SkeletonDumpApp(int argc, char* argv[]) : QCoreApplication(argc
         return;
     }
     QByteArray blob = file.readAll();
-    std::unique_ptr<FBXGeometry> fbxGeometry(readFBX(blob, QVariantHash()));
-    std::unique_ptr<AnimSkeleton> skeleton(new AnimSkeleton(*fbxGeometry));
+    std::unique_ptr<HFMGeometry> geometry(readFBX(blob, QVariantHash()));
+    std::unique_ptr<AnimSkeleton> skeleton(new AnimSkeleton(*geometry));
     skeleton->dump(verbose);
 }
 
diff --git a/tools/vhacd-util/src/VHACDUtil.cpp b/tools/vhacd-util/src/VHACDUtil.cpp
index a52e948f01..bb2958e11d 100644
--- a/tools/vhacd-util/src/VHACDUtil.cpp
+++ b/tools/vhacd-util/src/VHACDUtil.cpp
@@ -19,16 +19,16 @@
 
 // FBXReader jumbles the order of the meshes by reading them back out of a hashtable.  This will put
 // them back in the order in which they appeared in the file.
-bool FBXGeometryLessThan(const FBXMesh& e1, const FBXMesh& e2) {
+bool HFMGeometryLessThan(const HFMMesh& e1, const HFMMesh& e2) {
     return e1.meshIndex < e2.meshIndex;
 }
-void reSortFBXGeometryMeshes(FBXGeometry& geometry) {
-    qSort(geometry.meshes.begin(), geometry.meshes.end(), FBXGeometryLessThan);
+void reSortHFMGeometryMeshes(HFMGeometry& geometry) {
+    qSort(geometry.meshes.begin(), geometry.meshes.end(), HFMGeometryLessThan);
 }
 
 
 // Read all the meshes from provided FBX file
-bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
+bool vhacd::VHACDUtil::loadFBX(const QString filename, HFMGeometry& result) {
     if (_verbose) {
         qDebug() << "reading FBX file =" << filename << "...";
     }
@@ -41,7 +41,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
     }
     try {
         QByteArray fbxContents = fbx.readAll();
-        FBXGeometry::Pointer geom;
+        HFMGeometry::Pointer geom;
         if (filename.toLower().endsWith(".obj")) {
             bool combineParts = false;
             geom = OBJReader().readOBJ(fbxContents, QVariantHash(), combineParts);
@@ -53,7 +53,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
         }
         result = *geom;
 
-        reSortFBXGeometryMeshes(result);
+        reSortHFMGeometryMeshes(result);
     } catch (const QString& error) {
         qWarning() << "error reading" << filename << ":" << error;
         return false;
@@ -63,7 +63,7 @@ bool vhacd::VHACDUtil::loadFBX(const QString filename, FBXGeometry& result) {
 }
 
 
-void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& triangleIndices) {
+void getTrianglesInMeshPart(const HFMMeshPart &meshPart, std::vector<int>& triangleIndices) {
     // append triangle indices
     triangleIndices.reserve(triangleIndices.size() + (size_t)meshPart.triangleIndices.size());
     for (auto index : meshPart.triangleIndices) {
@@ -88,12 +88,12 @@ void getTrianglesInMeshPart(const FBXMeshPart &meshPart, std::vector<int>& trian
     }
 }
 
-void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometryOffset, FBXMesh& result) const {
+void vhacd::VHACDUtil::fattenMesh(const HFMMesh& mesh, const glm::mat4& geometryOffset, HFMMesh& result) const {
     // this is used to make meshes generated from a highfield collidable.  each triangle
     // is converted into a tetrahedron and made into its own mesh-part.
 
     std::vector<int> triangleIndices;
-    foreach (const FBXMeshPart &meshPart, mesh.parts) {
+    foreach (const HFMMeshPart &meshPart, mesh.parts) {
         getTrianglesInMeshPart(meshPart, triangleIndices);
     }
 
@@ -145,7 +145,7 @@ void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometry
         int index3 = result.vertices.size();
         result.vertices << p3; // add the new point to the result mesh
 
-        FBXMeshPart newMeshPart;
+        HFMMeshPart newMeshPart;
         setMeshPartDefaults(newMeshPart, "unknown");
         newMeshPart.triangleIndices << index0 << index1 << index2;
         newMeshPart.triangleIndices << index0 << index3 << index1;
@@ -155,7 +155,7 @@ void vhacd::VHACDUtil::fattenMesh(const FBXMesh& mesh, const glm::mat4& geometry
     }
 }
 
-AABox getAABoxForMeshPart(const FBXMesh& mesh, const FBXMeshPart &meshPart) {
+AABox getAABoxForMeshPart(const HFMMesh& mesh, const HFMMeshPart &meshPart) {
     AABox aaBox;
     const int TRIANGLE_STRIDE = 3;
     for (int i = 0; i < meshPart.triangleIndices.size(); i += TRIANGLE_STRIDE) {
@@ -242,7 +242,7 @@ bool isClosedManifold(const std::vector<int>& triangleIndices) {
     return true;
 }
 
-void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& resultMesh) const {
+void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, HFMMesh& resultMesh) const {
     // Number of hulls for this input meshPart
     uint32_t numHulls = convexifier->GetNConvexHulls();
     if (_verbose) {
@@ -256,8 +256,8 @@ void vhacd::VHACDUtil::getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& res
         VHACD::IVHACD::ConvexHull hull;
         convexifier->GetConvexHull(j, hull);
 
-        resultMesh.parts.append(FBXMeshPart());
-        FBXMeshPart& resultMeshPart = resultMesh.parts.last();
+        resultMesh.parts.append(HFMMeshPart());
+        HFMMeshPart& resultMeshPart = resultMesh.parts.last();
 
         int hullIndexStart = resultMesh.vertices.size();
         resultMesh.vertices.reserve(hullIndexStart + hull.m_nPoints);
@@ -288,9 +288,9 @@ float computeDt(uint64_t start) {
     return (float)(usecTimestampNow() - start) / (float)USECS_PER_SECOND;
 }
 
-bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
+bool vhacd::VHACDUtil::computeVHACD(HFMGeometry& geometry,
                                     VHACD::IVHACD::Parameters params,
-                                    FBXGeometry& result,
+                                    HFMGeometry& result,
                                     float minimumMeshSize, float maximumMeshSize) {
     if (_verbose) {
         qDebug() << "meshes =" << geometry.meshes.size();
@@ -298,7 +298,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
     // count the mesh-parts
     int numParts = 0;
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
         numParts += mesh.parts.size();
     }
     if (_verbose) {
@@ -308,15 +308,15 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
     VHACD::IVHACD * convexifier = VHACD::CreateVHACD();
 
     result.meshExtents.reset();
-    result.meshes.append(FBXMesh());
-    FBXMesh &resultMesh = result.meshes.last();
+    result.meshes.append(HFMMesh());
+    HFMMesh &resultMesh = result.meshes.last();
 
     const uint32_t POINT_STRIDE = 3;
     const uint32_t TRIANGLE_STRIDE = 3;
 
     int meshIndex = 0;
     int validPartsFound = 0;
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
 
         // find duplicate points
         int numDupes = 0;
@@ -354,7 +354,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
         int partIndex = 0;
         std::vector<int> triangleIndices;
-        foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMeshPart &meshPart, mesh.parts) {
             triangleIndices.clear();
             getTrianglesInMeshPart(meshPart, triangleIndices);
 
@@ -421,7 +421,7 @@ bool vhacd::VHACDUtil::computeVHACD(FBXGeometry& geometry,
 
             triangleIndices.clear();
             for (auto index : openParts) {
-                const FBXMeshPart &meshPart = mesh.parts[index];
+                const HFMMeshPart &meshPart = mesh.parts[index];
                 getTrianglesInMeshPart(meshPart, triangleIndices);
             }
 
diff --git a/tools/vhacd-util/src/VHACDUtil.h b/tools/vhacd-util/src/VHACDUtil.h
index 35ec3ef56b..64e86ed7df 100644
--- a/tools/vhacd-util/src/VHACDUtil.h
+++ b/tools/vhacd-util/src/VHACDUtil.h
@@ -27,16 +27,16 @@ namespace vhacd {
     public:
         void setVerbose(bool verbose) { _verbose = verbose; }
 
-        bool loadFBX(const QString filename, FBXGeometry& result);
+        bool loadFBX(const QString filename, HFMGeometry& result);
 
-        void fattenMesh(const FBXMesh& mesh, const glm::mat4& gometryOffset, FBXMesh& result) const;
+        void fattenMesh(const HFMMesh& mesh, const glm::mat4& gometryOffset, HFMMesh& result) const;
 
-        bool computeVHACD(FBXGeometry& geometry,
+        bool computeVHACD(HFMGeometry& geometry,
                           VHACD::IVHACD::Parameters params,
-                          FBXGeometry& result,
+                          HFMGeometry& result,
                           float minimumMeshSize, float maximumMeshSize);
 
-        void getConvexResults(VHACD::IVHACD* convexifier, FBXMesh& resultMesh) const;
+        void getConvexResults(VHACD::IVHACD* convexifier, HFMMesh& resultMesh) const;
 
         ~VHACDUtil();
 
@@ -55,6 +55,6 @@ namespace vhacd {
     };
 }
 
-AABox getAABoxForMeshPart(const FBXMeshPart &meshPart);
+AABox getAABoxForMeshPart(const HFMMeshPart &meshPart);
 
 #endif //hifi_VHACDUtil_h
diff --git a/tools/vhacd-util/src/VHACDUtilApp.cpp b/tools/vhacd-util/src/VHACDUtilApp.cpp
index c263dce609..0941198234 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.cpp
+++ b/tools/vhacd-util/src/VHACDUtilApp.cpp
@@ -36,7 +36,7 @@ QString formatFloat(double n) {
 }
 
 
-bool VHACDUtilApp::writeOBJ(QString outFileName, FBXGeometry& geometry, bool outputCentimeters, int whichMeshPart) {
+bool VHACDUtilApp::writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart) {
     QFile file(outFileName);
     if (!file.open(QIODevice::WriteOnly)) {
         qWarning() << "unable to write to" << outFileName;
@@ -56,9 +56,9 @@ bool VHACDUtilApp::writeOBJ(QString outFileName, FBXGeometry& geometry, bool out
 
     int vertexIndexOffset = 0;
 
-    foreach (const FBXMesh& mesh, geometry.meshes) {
+    foreach (const HFMMesh& mesh, geometry.meshes) {
         bool verticesHaveBeenOutput = false;
-        foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMeshPart &meshPart, mesh.parts) {
             if (whichMeshPart >= 0 && nth != (unsigned int) whichMeshPart) {
                 nth++;
                 continue;
@@ -297,7 +297,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     // load the mesh
-    FBXGeometry fbx;
+    HFMGeometry fbx;
     auto begin = std::chrono::high_resolution_clock::now();
     if (!vUtil.loadFBX(inputFilename, fbx)){
         _returnCode = VHACD_RETURN_CODE_FAILURE_TO_READ;
@@ -315,8 +315,8 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
         QVector<QString> infileExtensions = {"fbx", "obj"};
         QString baseFileName = fileNameWithoutExtension(outputFilename, infileExtensions);
         int count = 0;
-        foreach (const FBXMesh& mesh, fbx.meshes) {
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 QString outputFileName = baseFileName + "-" + QString::number(count) + ".obj";
                 writeOBJ(outputFileName, fbx, outputCentimeters, count);
                 count++;
@@ -358,7 +358,7 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
         }
         begin = std::chrono::high_resolution_clock::now();
 
-        FBXGeometry result;
+        HFMGeometry result;
         bool success = vUtil.computeVHACD(fbx, params, result, minimumMeshSize, maximumMeshSize);
 
         end = std::chrono::high_resolution_clock::now();
@@ -377,9 +377,9 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
 
         int totalVertices = 0;
         int totalTriangles = 0;
-        foreach (const FBXMesh& mesh, result.meshes) {
+        foreach (const HFMMesh& mesh, result.meshes) {
             totalVertices += mesh.vertices.size();
-            foreach (const FBXMeshPart &meshPart, mesh.parts) {
+            foreach (const HFMMeshPart &meshPart, mesh.parts) {
                 totalTriangles += meshPart.triangleIndices.size() / 3;
                 // each quad was made into two triangles
                 totalTriangles += 2 * meshPart.quadIndices.size() / 4;
@@ -398,17 +398,17 @@ VHACDUtilApp::VHACDUtilApp(int argc, char* argv[]) :
     }
 
     if (fattenFaces) {
-        FBXGeometry newFbx;
-        FBXMesh result;
+        HFMGeometry newFbx;
+        HFMMesh result;
 
         // count the mesh-parts
         unsigned int meshCount = 0;
-        foreach (const FBXMesh& mesh, fbx.meshes) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
             meshCount += mesh.parts.size();
         }
 
         result.modelTransform = glm::mat4(); // Identity matrix
-        foreach (const FBXMesh& mesh, fbx.meshes) {
+        foreach (const HFMMesh& mesh, fbx.meshes) {
             vUtil.fattenMesh(mesh, fbx.offset, result);
         }
 
diff --git a/tools/vhacd-util/src/VHACDUtilApp.h b/tools/vhacd-util/src/VHACDUtilApp.h
index 0d75275802..3db49456a0 100644
--- a/tools/vhacd-util/src/VHACDUtilApp.h
+++ b/tools/vhacd-util/src/VHACDUtilApp.h
@@ -28,7 +28,7 @@ public:
     VHACDUtilApp(int argc, char* argv[]);
     ~VHACDUtilApp();
 
-    bool writeOBJ(QString outFileName, FBXGeometry& geometry, bool outputCentimeters, int whichMeshPart = -1);
+    bool writeOBJ(QString outFileName, HFMGeometry& geometry, bool outputCentimeters, int whichMeshPart = -1);
 
     int getReturnCode() const { return _returnCode; }
 

From 3631e304badd027966f363c54089f2eadbd80e9b Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 5 Nov 2018 14:58:12 -0800
Subject: [PATCH 60/73] Acquisition

---
 .../InspectionCertificate.qml                 | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 734292d774..885838a26e 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -103,8 +103,8 @@ Rectangle {
                     showInMarketplaceButton.visible = false;
                     // "Edition" text previously set above in this function
                     // "Owner" text previously set above in this function
-                    // "Date Acquired" text previously set above in this function
-                    // "Original Price" text previously set above in this function
+                    // "Acquisition Date" text previously set above in this function
+                    // "Acquisition Price" text previously set above in this function
                     if (result.data.invalid_reason) {
                         errorText.text = result.data.invalid_reason;
                     }
@@ -118,8 +118,8 @@ Rectangle {
                     showInMarketplaceButton.visible = true;
                     // "Edition" text previously set above in this function
                     // "Owner" text previously set above in this function
-                    // "Date Acquired" text previously set above in this function
-                    // "Original Price" text previously set above in this function
+                    // "Acquisition Date" text previously set above in this function
+                    // "Acquisition Price" text previously set above in this function
                     errorText.text = "The status of this item is still pending confirmation. If the purchase is not confirmed, " +
                     "this entity will be cleaned up by the domain.";
                 }
@@ -146,8 +146,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             // "Edition" text will be set in "onCertificateInfoResult()"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Date Acquired" text will be set in "onCertificateInfoResult()"
-            // "Original Price" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Date" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Price" text will be set in "onCertificateInfoResult()"
             errorText.text = "";
         } else if (root.certificateStatus === 2) { // CERTIFICATE_STATUS_VERIFICATION_TIMEOUT
             root.useGoldCert = false;
@@ -176,8 +176,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             // "Edition" text will be set in "onCertificateInfoResult()"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Date Acquired" text will be set in "onCertificateInfoResult()"
-            // "Original Price" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Date" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Price" text will be set in "onCertificateInfoResult()"
             errorText.text = "The information associated with this item has been modified and it no longer matches the original certified item.";
         } else if (root.certificateStatus === 4) { // CERTIFICATE_STATUS_OWNER_VERIFICATION_FAILED
             root.useGoldCert = false;
@@ -191,8 +191,8 @@ Rectangle {
             // "Item Name" text will be set in "onCertificateInfoResult()"
             root.itemEdition = "Uncertified Copy"
             // "Owner" text will be set in "onCertificateInfoResult()"
-            // "Date Acquired" text will be set in "onCertificateInfoResult()"
-            // "Original Price" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Date" text will be set in "onCertificateInfoResult()"
+            // "Acquisition Price" text will be set in "onCertificateInfoResult()"
             // "Error Text" text will be set in "onCertificateInfoResult()"
         } else {
             console.log("Unknown certificate status received from ledger signal!");
@@ -487,7 +487,7 @@ Rectangle {
 
         RalewayRegular {
             id: dateAcquiredHeader;
-            text: "DATE ACQUIRED";
+            text: "ACQUISITION DATE";
             // Text size
             size: 16;
             // Anchors
@@ -517,7 +517,7 @@ Rectangle {
 
         RalewayRegular {
             id: priceHeader;
-            text: "ORIGINAL PRICE";
+            text: "ACQUISITION PRICE";
             // Text size
             size: 16;
             // Anchors

From 5b042ec3dfbd846f8a26d09ec4284ffe1e7bdf83 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Mon, 5 Nov 2018 15:23:25 -0800
Subject: [PATCH 61/73] My items to my submissions

---
 .../qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml    | 4 ++--
 interface/resources/qml/hifi/commerce/purchases/Purchases.qml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 4b0166425a..99c2d89da8 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -213,7 +213,7 @@ Item {
             anchors.topMargin: -buttonAndUsernameContainer.anchors.bottomMargin;
             anchors.right: buttonAndUsernameContainer.right;
             height: childrenRect.height;
-            width: 100;
+            width: 150;
 
             Rectangle {
                 id: myItemsButton;
@@ -225,7 +225,7 @@ Item {
 
                 RalewaySemiBold {
                     anchors.fill: parent;
-                    text: "My Items"
+                    text: "My Submissions"
                     color: hifi.colors.baseGray;
                     horizontalAlignment: Text.AlignHCenter;
                     verticalAlignment: Text.AlignVCenter;
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index ced5450290..df4d7f6175 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -882,7 +882,7 @@ Rectangle {
             // Explanitory text
             RalewayRegular {
                 id: noItemsYet;
-                text: "<b>You haven't submitted anything to the Marketplace yet!</b><br><br>Submit an item to the Marketplace to add it to My Items.";
+                text: "<b>You haven't submitted anything to the Marketplace yet!</b><br><br>Submit an item to the Marketplace to add it to My Submissions.";
                 // Text size
                 size: 22;
                 // Anchors

From 89656ea3f6e44835bfca84fb1f63e727cab364b3 Mon Sep 17 00:00:00 2001
From: Howard Stearns <howard@highfidelity.io>
Date: Mon, 5 Nov 2018 16:43:06 -0800
Subject: [PATCH 62/73] activity notifications also change ASSETS to INVENTORY

---
 scripts/system/commerce/wallet.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js
index f9857992bb..9fb336f79c 100644
--- a/scripts/system/commerce/wallet.js
+++ b/scripts/system/commerce/wallet.js
@@ -608,12 +608,12 @@ function notificationPollCallbackHistory(historyArray) {
             var message;
             if (!ui.notificationInitialCallbackMade[1]) {
                 message = "You have " + notificationCount + " unread recent " +
-                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open ASSETS to see all activity.";
+                    "transaction" + (notificationCount === 1 ? "" : "s") + ". Open INVENTORY to see all activity.";
                 ui.notificationDisplayBanner(message);
             } else {
                 for (var i = 0; i < notificationCount; i++) {
                     message = '"' + (historyArray[i].message) + '" ' +
-                        "Open ASSETS to see all activity.";
+                        "Open INVENTORY to see all activity.";
                     ui.notificationDisplayBanner(message);
                 }
             }

From 27bb8a0de7cc460576125c6a2d529c8fa40836d6 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Fri, 15 Jun 2018 21:44:12 +0300
Subject: [PATCH 63/73] rename stylues-uit => stylesUit & controls-uit =>
 controlsUit

note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:

1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
---
 interface/resources/qml/AudioScopeUI.qml              |  4 ++--
 interface/resources/qml/Browser.qml                   |  4 ++--
 interface/resources/qml/CurrentAPI.qml                |  4 ++--
 interface/resources/qml/InfoView.qml                  |  2 +-
 interface/resources/qml/LoginDialog.qml               |  4 ++--
 .../qml/LoginDialog/+android/LinkAccountBody.qml      |  4 ++--
 .../resources/qml/LoginDialog/+android/SignUpBody.qml |  4 ++--
 .../resources/qml/LoginDialog/CompleteProfileBody.qml |  4 ++--
 .../resources/qml/LoginDialog/LinkAccountBody.qml     |  5 +++--
 interface/resources/qml/LoginDialog/SignInBody.qml    |  4 ++--
 interface/resources/qml/LoginDialog/SignUpBody.qml    |  4 ++--
 .../qml/LoginDialog/UsernameCollisionBody.qml         |  4 ++--
 interface/resources/qml/LoginDialog/WelcomeBody.qml   |  4 ++--
 interface/resources/qml/QmlWebWindow.qml              |  4 ++--
 interface/resources/qml/QmlWindow.qml                 |  4 ++--
 interface/resources/qml/TabletBrowser.qml             |  4 ++--
 interface/resources/qml/UpdateDialog.qml              |  4 ++--
 interface/resources/qml/controls/Button.qml           |  1 -
 .../resources/qml/controls/FlickableWebViewCore.qml   |  2 +-
 interface/resources/qml/controls/TabletWebButton.qml  |  2 +-
 interface/resources/qml/controls/TabletWebScreen.qml  |  2 +-
 interface/resources/qml/controls/TabletWebView.qml    |  4 ++--
 interface/resources/qml/controls/WebView.qml          |  2 +-
 .../+android/ImageButton.qml                          |  6 +++---
 .../AttachmentsTable.qml                              |  4 ++--
 .../qml/{controls-uit => controlsUit}/BaseWebView.qml |  0
 .../qml/{controls-uit => controlsUit}/Button.qml      |  2 +-
 .../qml/{controls-uit => controlsUit}/CheckBox.qml    |  2 +-
 .../{controls-uit => controlsUit}/CheckBoxQQC2.qml    |  4 ++--
 .../qml/{controls-uit => controlsUit}/ComboBox.qml    |  4 ++--
 .../{controls-uit => controlsUit}/ContentSection.qml  |  2 +-
 .../qml/{controls-uit => controlsUit}/FilterBar.qml   |  4 ++--
 .../qml/{controls-uit => controlsUit}/GlyphButton.qml |  2 +-
 .../{controls-uit => controlsUit}/HorizontalRule.qml  |  0
 .../HorizontalSpacer.qml                              |  2 +-
 .../{controls-uit => controlsUit}/ImageMessageBox.qml |  2 +-
 .../qml/{controls-uit => controlsUit}/Key.qml         |  0
 .../qml/{controls-uit => controlsUit}/Keyboard.qml    |  0
 .../qml/{controls-uit => controlsUit}/Label.qml       |  2 +-
 .../{controls-uit => controlsUit}/QueuedButton.qml    |  2 +-
 .../qml/{controls-uit => controlsUit}/RadioButton.qml |  4 ++--
 .../qml/{controls-uit => controlsUit}/ScrollBar.qml   |  2 +-
 .../qml/{controls-uit => controlsUit}/Separator.qml   |  2 +-
 .../qml/{controls-uit => controlsUit}/Slider.qml      |  4 ++--
 .../qml/{controls-uit => controlsUit}/SpinBox.qml     |  4 ++--
 .../qml/{controls-uit => controlsUit}/Switch.qml      |  2 +-
 .../qml/{controls-uit => controlsUit}/Table.qml       |  2 +-
 .../TabletContentSection.qml                          |  2 +-
 .../{controls-uit => controlsUit}/TabletHeader.qml    |  2 +-
 .../qml/{controls-uit => controlsUit}/TextAction.qml  |  4 ++--
 .../qml/{controls-uit => controlsUit}/TextEdit.qml    |  2 +-
 .../qml/{controls-uit => controlsUit}/TextField.qml   |  4 ++--
 .../qml/{controls-uit => controlsUit}/ToolTip.qml     |  0
 .../qml/{controls-uit => controlsUit}/Tree.qml        |  2 +-
 .../{controls-uit => controlsUit}/VerticalSpacer.qml  |  2 +-
 .../{controls-uit => controlsUit}/WebGlyphButton.qml  |  2 +-
 .../qml/{controls-uit => controlsUit}/WebSpinner.qml  |  0
 .../qml/{controls-uit => controlsUit}/WebView.qml     |  0
 .../qml/{controls-uit => controlsUit}/qmldir          |  0
 interface/resources/qml/dialogs/AssetDialog.qml       |  2 +-
 interface/resources/qml/dialogs/CustomQueryDialog.qml |  4 ++--
 interface/resources/qml/dialogs/FileDialog.qml        |  4 ++--
 interface/resources/qml/dialogs/MessageDialog.qml     |  4 ++--
 interface/resources/qml/dialogs/PreferencesDialog.qml |  4 ++--
 interface/resources/qml/dialogs/QueryDialog.qml       |  4 ++--
 interface/resources/qml/dialogs/TabletAssetDialog.qml |  2 +-
 .../resources/qml/dialogs/TabletCustomQueryDialog.qml |  4 ++--
 interface/resources/qml/dialogs/TabletFileDialog.qml  |  4 ++--
 interface/resources/qml/dialogs/TabletLoginDialog.qml |  4 ++--
 interface/resources/qml/dialogs/TabletMessageBox.qml  |  4 ++--
 interface/resources/qml/dialogs/TabletQueryDialog.qml |  4 ++--
 .../qml/dialogs/assetDialog/AssetDialogContent.qml    |  4 ++--
 .../qml/dialogs/fileDialog/FileTypeSelection.qml      |  2 +-
 .../qml/dialogs/messageDialog/MessageDialogButton.qml |  2 +-
 .../qml/dialogs/preferences/AvatarPreference.qml      |  2 +-
 .../qml/dialogs/preferences/BrowsablePreference.qml   |  2 +-
 .../qml/dialogs/preferences/ButtonPreference.qml      |  2 +-
 .../qml/dialogs/preferences/CheckBoxPreference.qml    |  2 +-
 .../qml/dialogs/preferences/ComboBoxPreference.qml    |  4 ++--
 .../qml/dialogs/preferences/EditablePreference.qml    |  2 +-
 .../qml/dialogs/preferences/PrimaryHandPreference.qml |  2 +-
 .../dialogs/preferences/RadioButtonsPreference.qml    |  4 ++--
 .../resources/qml/dialogs/preferences/Section.qml     |  4 ++--
 .../qml/dialogs/preferences/SliderPreference.qml      |  2 +-
 .../qml/dialogs/preferences/SpinBoxPreference.qml     |  2 +-
 .../dialogs/preferences/SpinnerSliderPreference.qml   |  2 +-
 interface/resources/qml/hifi/+android/ActionBar.qml   |  4 ++--
 interface/resources/qml/hifi/+android/AudioBar.qml    |  4 ++--
 .../resources/qml/hifi/+android/AvatarOption.qml      |  2 +-
 interface/resources/qml/hifi/+android/StatsBar.qml    |  4 ++--
 .../resources/qml/hifi/+android/WindowHeader.qml      |  4 ++--
 .../resources/qml/hifi/+android/bottomHudOptions.qml  |  4 ++--
 interface/resources/qml/hifi/+android/modesbar.qml    |  4 ++--
 interface/resources/qml/hifi/AssetServer.qml          |  4 ++--
 interface/resources/qml/hifi/Card.qml                 |  2 +-
 interface/resources/qml/hifi/ComboDialog.qml          |  4 ++--
 interface/resources/qml/hifi/Desktop.qml              |  2 +-
 .../resources/qml/hifi/DesktopLetterboxMessage.qml    |  2 +-
 interface/resources/qml/hifi/Feed.qml                 |  2 +-
 interface/resources/qml/hifi/LetterboxMessage.qml     |  2 +-
 interface/resources/qml/hifi/NameCard.qml             |  4 ++--
 interface/resources/qml/hifi/Pal.qml                  |  4 ++--
 interface/resources/qml/hifi/SkyboxChanger.qml        |  4 ++--
 interface/resources/qml/hifi/SpectatorCamera.qml      |  4 ++--
 interface/resources/qml/hifi/TabletTextButton.qml     |  2 +-
 interface/resources/qml/hifi/TextButton.qml           |  2 +-
 interface/resources/qml/hifi/WebBrowser.qml           |  4 ++--
 interface/resources/qml/hifi/audio/Audio.qml          |  4 ++--
 interface/resources/qml/hifi/audio/AudioTabButton.qml |  4 ++--
 interface/resources/qml/hifi/audio/CheckBox.qml       |  2 +-
 .../resources/qml/hifi/audio/PlaySampleSound.qml      |  4 ++--
 .../resources/qml/hifi/commerce/checkout/Checkout.qml |  4 ++--
 .../qml/hifi/commerce/common/CommerceLightbox.qml     |  4 ++--
 .../commerce/common/EmulatedMarketplaceHeader.qml     |  4 ++--
 .../qml/hifi/commerce/common/FirstUseTutorial.qml     |  4 ++--
 .../hifi/commerce/common/sendAsset/ConnectionItem.qml |  4 ++--
 .../commerce/common/sendAsset/RecipientDisplay.qml    |  4 ++--
 .../qml/hifi/commerce/common/sendAsset/SendAsset.qml  |  4 ++--
 .../inspectionCertificate/InspectionCertificate.qml   |  4 ++--
 .../qml/hifi/commerce/purchases/PurchasedItem.qml     |  4 ++--
 .../qml/hifi/commerce/purchases/Purchases.qml         |  4 ++--
 interface/resources/qml/hifi/commerce/wallet/Help.qml |  4 ++--
 .../resources/qml/hifi/commerce/wallet/NeedsLogIn.qml |  4 ++--
 .../qml/hifi/commerce/wallet/PassphraseChange.qml     |  4 ++--
 .../qml/hifi/commerce/wallet/PassphraseModal.qml      |  4 ++--
 .../qml/hifi/commerce/wallet/PassphraseSelection.qml  |  4 ++--
 .../resources/qml/hifi/commerce/wallet/Wallet.qml     |  4 ++--
 .../qml/hifi/commerce/wallet/WalletChoice.qml         |  4 ++--
 .../resources/qml/hifi/commerce/wallet/WalletHome.qml |  4 ++--
 .../qml/hifi/commerce/wallet/WalletSetup.qml          |  4 ++--
 interface/resources/qml/hifi/dialogs/AboutDialog.qml  |  2 +-
 .../resources/qml/hifi/dialogs/RunningScripts.qml     |  4 ++--
 .../resources/qml/hifi/dialogs/TabletAboutDialog.qml  |  2 +-
 .../resources/qml/hifi/dialogs/TabletAssetServer.qml  |  4 ++--
 .../resources/qml/hifi/dialogs/TabletDCDialog.qml     |  4 ++--
 .../resources/qml/hifi/dialogs/TabletDebugWindow.qml  |  4 ++--
 .../qml/hifi/dialogs/TabletEntityStatistics.qml       |  4 ++--
 .../qml/hifi/dialogs/TabletEntityStatisticsItem.qml   |  4 ++--
 .../resources/qml/hifi/dialogs/TabletLODTools.qml     |  4 ++--
 .../qml/hifi/dialogs/TabletRunningScripts.qml         |  4 ++--
 .../qml/hifi/dialogs/content/ModelBrowserContent.qml  |  2 +-
 .../qml/hifi/dialogs/security/SecurityImageChange.qml |  4 ++--
 .../hifi/dialogs/security/SecurityImageSelection.qml  |  4 ++--
 .../resources/qml/hifi/tablet/CalibratingScreen.qml   |  4 ++--
 .../resources/qml/hifi/tablet/ControllerSettings.qml  |  4 ++--
 interface/resources/qml/hifi/tablet/EditTabButton.qml |  4 ++--
 interface/resources/qml/hifi/tablet/EditTabView.qml   |  4 ++--
 interface/resources/qml/hifi/tablet/InputRecorder.qml |  4 ++--
 .../resources/qml/hifi/tablet/NewMaterialDialog.qml   |  4 ++--
 .../resources/qml/hifi/tablet/NewModelDialog.qml      |  4 ++--
 .../resources/qml/hifi/tablet/OpenVrConfiguration.qml |  4 ++--
 .../resources/qml/hifi/tablet/TabletAddressDialog.qml |  4 ++--
 interface/resources/qml/hifi/tablet/TabletHome.qml    |  2 +-
 interface/resources/qml/hifi/tablet/TabletMenu.qml    |  2 +-
 .../resources/qml/hifi/tablet/TabletMenuItem.qml      |  4 ++--
 .../resources/qml/hifi/tablet/TabletMenuView.qml      |  2 +-
 .../qml/hifi/tablet/TabletModelBrowserDialog.qml      |  4 ++--
 .../hifi/tablet/tabletWindows/TabletFileDialog.qml    |  4 ++--
 .../tablet/tabletWindows/TabletPreferencesDialog.qml  |  4 ++--
 .../hifi/tablet/tabletWindows/preferences/Section.qml |  4 ++--
 .../preferences/TabletBrowsablePreference.qml         |  2 +-
 .../+android/HifiConstants.qml                        |  0
 .../{styles-uit => stylesUit}/AnonymousProRegular.qml |  0
 .../qml/{styles-uit => stylesUit}/ButtonLabel.qml     |  0
 .../qml/{styles-uit => stylesUit}/FiraSansRegular.qml |  0
 .../{styles-uit => stylesUit}/FiraSansSemiBold.qml    |  0
 .../qml/{styles-uit => stylesUit}/HiFiGlyphs.qml      |  0
 .../qml/{styles-uit => stylesUit}/HifiConstants.qml   |  0
 .../qml/{styles-uit => stylesUit}/IconButton.qml      |  0
 .../qml/{styles-uit => stylesUit}/InfoItem.qml        |  0
 .../qml/{styles-uit => stylesUit}/InputLabel.qml      |  0
 .../qml/{styles-uit => stylesUit}/ListItem.qml        |  0
 .../resources/qml/{styles-uit => stylesUit}/Logs.qml  |  0
 .../qml/{styles-uit => stylesUit}/OverlayTitle.qml    |  0
 .../qml/{styles-uit => stylesUit}/RalewayBold.qml     |  0
 .../qml/{styles-uit => stylesUit}/RalewayLight.qml    |  0
 .../qml/{styles-uit => stylesUit}/RalewayRegular.qml  |  0
 .../qml/{styles-uit => stylesUit}/RalewaySemiBold.qml |  0
 .../qml/{styles-uit => stylesUit}/SectionName.qml     |  0
 .../qml/{styles-uit => stylesUit}/Separator.qml       |  2 +-
 .../qml/{styles-uit => stylesUit}/ShortcutText.qml    |  0
 .../qml/{styles-uit => stylesUit}/TabName.qml         |  0
 .../qml/{styles-uit => stylesUit}/TextFieldInput.qml  |  0
 .../resources/qml/{styles-uit => stylesUit}/qmldir    |  0
 interface/resources/qml/windows/Decoration.qml        |  2 +-
 interface/resources/qml/windows/DefaultFrame.qml      |  2 +-
 .../resources/qml/windows/DefaultFrameDecoration.qml  |  2 +-
 interface/resources/qml/windows/Fadable.qml           |  2 +-
 interface/resources/qml/windows/Frame.qml             |  2 +-
 interface/resources/qml/windows/ModalFrame.qml        |  4 ++--
 interface/resources/qml/windows/ScrollingWindow.qml   |  4 ++--
 interface/resources/qml/windows/TabletModalFrame.qml  |  4 ++--
 interface/resources/qml/windows/ToolFrame.qml         |  2 +-
 .../resources/qml/windows/ToolFrameDecoration.qml     |  2 +-
 interface/resources/qml/windows/Window.qml            |  2 +-
 libraries/ui/src/ui/OffscreenQmlSurface.cpp           |  1 +
 scripts/developer/tests/ControlsGallery.qml           | 11 ++---------
 197 files changed, 272 insertions(+), 278 deletions(-)
 rename interface/resources/qml/{controls-uit => controlsUit}/+android/ImageButton.qml (96%)
 rename interface/resources/qml/{controls-uit => controlsUit}/AttachmentsTable.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/BaseWebView.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Button.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/CheckBox.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/CheckBoxQQC2.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/ComboBox.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/ContentSection.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/FilterBar.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/GlyphButton.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/HorizontalRule.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/HorizontalSpacer.qml (94%)
 rename interface/resources/qml/{controls-uit => controlsUit}/ImageMessageBox.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Key.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Keyboard.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Label.qml (97%)
 rename interface/resources/qml/{controls-uit => controlsUit}/QueuedButton.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/RadioButton.qml (97%)
 rename interface/resources/qml/{controls-uit => controlsUit}/ScrollBar.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Separator.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Slider.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/SpinBox.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Switch.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Table.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/TabletContentSection.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/TabletHeader.qml (96%)
 rename interface/resources/qml/{controls-uit => controlsUit}/TextAction.qml (96%)
 rename interface/resources/qml/{controls-uit => controlsUit}/TextEdit.qml (95%)
 rename interface/resources/qml/{controls-uit => controlsUit}/TextField.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/ToolTip.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/Tree.qml (99%)
 rename interface/resources/qml/{controls-uit => controlsUit}/VerticalSpacer.qml (94%)
 rename interface/resources/qml/{controls-uit => controlsUit}/WebGlyphButton.qml (98%)
 rename interface/resources/qml/{controls-uit => controlsUit}/WebSpinner.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/WebView.qml (100%)
 rename interface/resources/qml/{controls-uit => controlsUit}/qmldir (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/+android/HifiConstants.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/AnonymousProRegular.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/ButtonLabel.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/FiraSansRegular.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/FiraSansSemiBold.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/HiFiGlyphs.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/HifiConstants.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/IconButton.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/InfoItem.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/InputLabel.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/ListItem.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/Logs.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/OverlayTitle.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/RalewayBold.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/RalewayLight.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/RalewayRegular.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/RalewaySemiBold.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/SectionName.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/Separator.qml (97%)
 rename interface/resources/qml/{styles-uit => stylesUit}/ShortcutText.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/TabName.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/TextFieldInput.qml (100%)
 rename interface/resources/qml/{styles-uit => stylesUit}/qmldir (100%)

diff --git a/interface/resources/qml/AudioScopeUI.qml b/interface/resources/qml/AudioScopeUI.qml
index aa181dbf8d..91908807e2 100644
--- a/interface/resources/qml/AudioScopeUI.qml
+++ b/interface/resources/qml/AudioScopeUI.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 Item {
     id: root
diff --git a/interface/resources/qml/Browser.qml b/interface/resources/qml/Browser.qml
index 4474cfb2cd..01de7a36f9 100644
--- a/interface/resources/qml/Browser.qml
+++ b/interface/resources/qml/Browser.qml
@@ -2,9 +2,9 @@ import QtQuick 2.5
 import QtWebChannel 1.0
 import QtWebEngine 1.5
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/CurrentAPI.qml b/interface/resources/qml/CurrentAPI.qml
index 96bfb5c36b..4ea45041c3 100644
--- a/interface/resources/qml/CurrentAPI.qml
+++ b/interface/resources/qml/CurrentAPI.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "styles-uit"
-import "controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: root
diff --git a/interface/resources/qml/InfoView.qml b/interface/resources/qml/InfoView.qml
index f18969fb2f..8c5900b4c3 100644
--- a/interface/resources/qml/InfoView.qml
+++ b/interface/resources/qml/InfoView.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Hifi 1.0 as Hifi
 
-import "controls-uit"
+import controlsUit 1.0
 import "windows" as Windows
 
 Windows.ScrollingWindow {
diff --git a/interface/resources/qml/LoginDialog.qml b/interface/resources/qml/LoginDialog.qml
index 336858502d..12117aaba4 100644
--- a/interface/resources/qml/LoginDialog.qml
+++ b/interface/resources/qml/LoginDialog.qml
@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "controls-uit"
-import "styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "windows"
 
 import "LoginDialog"
diff --git a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
index 96b638c911..a40110b1e9 100644
--- a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: linkAccountBody
diff --git a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
index 3a44a8d741..10909e4c85 100644
--- a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/+android/SignUpBody.qml
@@ -13,8 +13,8 @@ import QtQuick 2.4
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: signupBody
diff --git a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
index fe4c511f1d..3a57061de4 100644
--- a/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
+++ b/interface/resources/qml/LoginDialog/CompleteProfileBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: completeProfileBody
diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index dbe4235cdd..103761236d 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -13,8 +13,9 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
+
 Item {
     id: linkAccountBody
     clip: true
diff --git a/interface/resources/qml/LoginDialog/SignInBody.qml b/interface/resources/qml/LoginDialog/SignInBody.qml
index 9cb1add704..7fe29e13f6 100644
--- a/interface/resources/qml/LoginDialog/SignInBody.qml
+++ b/interface/resources/qml/LoginDialog/SignInBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls.Styles 1.4 as OriginalStyles
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: signInBody
diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml
index bb30696e4c..d3c898d76f 100644
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.7
 import QtQuick.Controls 1.4
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: signupBody
diff --git a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
index bf05a36ce1..2a41353534 100644
--- a/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
+++ b/interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
@@ -12,8 +12,8 @@ import Hifi 1.0
 import QtQuick 2.4
 import QtQuick.Controls 1.4
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: usernameCollisionBody
diff --git a/interface/resources/qml/LoginDialog/WelcomeBody.qml b/interface/resources/qml/LoginDialog/WelcomeBody.qml
index 551ec263b7..020e6db002 100644
--- a/interface/resources/qml/LoginDialog/WelcomeBody.qml
+++ b/interface/resources/qml/LoginDialog/WelcomeBody.qml
@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.4
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: welcomeBody
diff --git a/interface/resources/qml/QmlWebWindow.qml b/interface/resources/qml/QmlWebWindow.qml
index 8c4d6145ec..322535641d 100644
--- a/interface/resources/qml/QmlWebWindow.qml
+++ b/interface/resources/qml/QmlWebWindow.qml
@@ -13,8 +13,8 @@ import QtWebEngine 1.1
 import QtWebChannel 1.0
 
 import "windows" as Windows
-import "controls-uit" as Controls
-import "styles-uit"
+import controlsUit 1.0 as Controls
+import stylesUit 1.0
 
 Windows.ScrollingWindow {
     id: root
diff --git a/interface/resources/qml/QmlWindow.qml b/interface/resources/qml/QmlWindow.qml
index bef6423e25..53e6bcc37d 100644
--- a/interface/resources/qml/QmlWindow.qml
+++ b/interface/resources/qml/QmlWindow.qml
@@ -2,9 +2,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root
diff --git a/interface/resources/qml/TabletBrowser.qml b/interface/resources/qml/TabletBrowser.qml
index 141c1f25a7..720a904231 100644
--- a/interface/resources/qml/TabletBrowser.qml
+++ b/interface/resources/qml/TabletBrowser.qml
@@ -3,9 +3,9 @@ import QtWebChannel 1.0
 import QtWebEngine 1.5
 
 import "controls"
-import "controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 Item {
diff --git a/interface/resources/qml/UpdateDialog.qml b/interface/resources/qml/UpdateDialog.qml
index 5e05601ce4..9c22d0b65b 100644
--- a/interface/resources/qml/UpdateDialog.qml
+++ b/interface/resources/qml/UpdateDialog.qml
@@ -4,9 +4,9 @@ import QtQuick.Controls 1.3
 import QtQuick.Controls.Styles 1.3
 import QtGraphicalEffects 1.0
 
-import "controls-uit"
+import controlsUit 1.0
 import "styles" as HifiStyles
-import "styles-uit"
+import stylesUit 1.0
 import "windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/controls/Button.qml b/interface/resources/qml/controls/Button.qml
index 6cbdec5644..b677822c0e 100644
--- a/interface/resources/qml/controls/Button.qml
+++ b/interface/resources/qml/controls/Button.qml
@@ -3,7 +3,6 @@ import QtQuick.Controls 2.2 as Original
 
 import "."
 import "../styles"
-import "../controls-uit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls/FlickableWebViewCore.qml b/interface/resources/qml/controls/FlickableWebViewCore.qml
index 943f15e1de..cce32c137a 100644
--- a/interface/resources/qml/controls/FlickableWebViewCore.qml
+++ b/interface/resources/qml/controls/FlickableWebViewCore.qml
@@ -4,7 +4,7 @@ import QtWebChannel 1.0
 
 import QtQuick.Controls 2.2
 
-import "../styles-uit" as StylesUIt
+import stylesUit 1.0 as StylesUIt
 
 Item {
     id: flick
diff --git a/interface/resources/qml/controls/TabletWebButton.qml b/interface/resources/qml/controls/TabletWebButton.qml
index d016f71f2d..140461d817 100644
--- a/interface/resources/qml/controls/TabletWebButton.qml
+++ b/interface/resources/qml/controls/TabletWebButton.qml
@@ -10,7 +10,7 @@
 
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text
diff --git a/interface/resources/qml/controls/TabletWebScreen.qml b/interface/resources/qml/controls/TabletWebScreen.qml
index bb037ad478..be11f16498 100644
--- a/interface/resources/qml/controls/TabletWebScreen.qml
+++ b/interface/resources/qml/controls/TabletWebScreen.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls/TabletWebView.qml b/interface/resources/qml/controls/TabletWebView.qml
index db695dbfb2..0c5ca37e00 100644
--- a/interface/resources/qml/controls/TabletWebView.qml
+++ b/interface/resources/qml/controls/TabletWebView.qml
@@ -1,8 +1,8 @@
 import QtQuick 2.7
 import QtWebEngine 1.5
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 import "../styles" as HifiStyles
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls/WebView.qml b/interface/resources/qml/controls/WebView.qml
index 71bf69fdc8..375bcd50e0 100644
--- a/interface/resources/qml/controls/WebView.qml
+++ b/interface/resources/qml/controls/WebView.qml
@@ -1,5 +1,5 @@
 import QtQuick 2.7
-import "../controls-uit" as HiFiControls
+import controlsUit 1.0 as HiFiControls
 
 Item {
     width: parent !== null ? parent.width : undefined
diff --git a/interface/resources/qml/controls-uit/+android/ImageButton.qml b/interface/resources/qml/controlsUit/+android/ImageButton.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/+android/ImageButton.qml
rename to interface/resources/qml/controlsUit/+android/ImageButton.qml
index 5ebf7cd3e9..88eaf95d76 100644
--- a/interface/resources/qml/controls-uit/+android/ImageButton.qml
+++ b/interface/resources/qml/controlsUit/+android/ImageButton.qml
@@ -1,6 +1,6 @@
 //
 //  ImageButton.qml
-//  interface/resources/qml/controls-uit
+//  interface/resources/qml/controlsUit
 //
 //  Created by Gabriel Calero & Cristian Duarte on 12 Oct 2017
 //  Copyright 2017 High Fidelity, Inc.
@@ -11,7 +11,7 @@
 
 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../styles-uit" as HifiStyles
+import "../stylesUit" as HifiStyles
 
 Item {
     id: button
@@ -79,4 +79,4 @@ Item {
             }
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/interface/resources/qml/controls-uit/AttachmentsTable.qml b/interface/resources/qml/controlsUit/AttachmentsTable.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/AttachmentsTable.qml
rename to interface/resources/qml/controlsUit/AttachmentsTable.qml
index 8ee9909ab8..a2677962da 100644
--- a/interface/resources/qml/controls-uit/AttachmentsTable.qml
+++ b/interface/resources/qml/controlsUit/AttachmentsTable.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.XmlListModel 2.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 import "../windows"
 import "../hifi/models"
 
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controlsUit/BaseWebView.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/BaseWebView.qml
rename to interface/resources/qml/controlsUit/BaseWebView.qml
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controlsUit/Button.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Button.qml
rename to interface/resources/qml/controlsUit/Button.qml
index f1a6e4bb4a..6ea7ce4b4c 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controlsUit/Button.qml
@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control;
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controlsUit/CheckBox.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/CheckBox.qml
rename to interface/resources/qml/controlsUit/CheckBox.qml
index 6e4a3df010..abf08908fb 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controlsUit/CheckBox.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.2
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 import TabletScriptingInterface 1.0
 
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controlsUit/CheckBoxQQC2.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/CheckBoxQQC2.qml
rename to interface/resources/qml/controlsUit/CheckBoxQQC2.qml
index 8a9686ff5e..91d35ecd58 100644
--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controlsUit/CheckBoxQQC2.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HiFiControls
+import "../stylesUit"
+import "." as HiFiControls
 import TabletScriptingInterface 1.0
 
 CheckBox {
diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controlsUit/ComboBox.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/ComboBox.qml
rename to interface/resources/qml/controlsUit/ComboBox.qml
index 245b565a62..8d1d7a5262 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controlsUit/ComboBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 FocusScope {
     id: root
diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controlsUit/ContentSection.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/ContentSection.qml
rename to interface/resources/qml/controlsUit/ContentSection.qml
index 47a13e9262..262c29220f 100644
--- a/interface/resources/qml/controls-uit/ContentSection.qml
+++ b/interface/resources/qml/controlsUit/ContentSection.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"
diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controlsUit/FilterBar.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/FilterBar.qml
rename to interface/resources/qml/controlsUit/FilterBar.qml
index 3d4e18ed48..0892018913 100644
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controlsUit/FilterBar.qml
@@ -12,8 +12,8 @@ import QtQuick 2.9
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Item {
     id: root;
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controlsUit/GlyphButton.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/GlyphButton.qml
rename to interface/resources/qml/controlsUit/GlyphButton.qml
index 9129486720..17f7fba2d6 100644
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controlsUit/GlyphButton.qml
@@ -12,7 +12,7 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 import TabletScriptingInterface 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls-uit/HorizontalRule.qml b/interface/resources/qml/controlsUit/HorizontalRule.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/HorizontalRule.qml
rename to interface/resources/qml/controlsUit/HorizontalRule.qml
diff --git a/interface/resources/qml/controls-uit/HorizontalSpacer.qml b/interface/resources/qml/controlsUit/HorizontalSpacer.qml
similarity index 94%
rename from interface/resources/qml/controls-uit/HorizontalSpacer.qml
rename to interface/resources/qml/controlsUit/HorizontalSpacer.qml
index 545154ab44..efcabf2699 100644
--- a/interface/resources/qml/controls-uit/HorizontalSpacer.qml
+++ b/interface/resources/qml/controlsUit/HorizontalSpacer.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls-uit/ImageMessageBox.qml b/interface/resources/qml/controlsUit/ImageMessageBox.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/ImageMessageBox.qml
rename to interface/resources/qml/controlsUit/ImageMessageBox.qml
index 74313f7ffe..46d93383a4 100644
--- a/interface/resources/qml/controls-uit/ImageMessageBox.qml
+++ b/interface/resources/qml/controlsUit/ImageMessageBox.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: imageBox
diff --git a/interface/resources/qml/controls-uit/Key.qml b/interface/resources/qml/controlsUit/Key.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/Key.qml
rename to interface/resources/qml/controlsUit/Key.qml
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controlsUit/Keyboard.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/Keyboard.qml
rename to interface/resources/qml/controlsUit/Keyboard.qml
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controlsUit/Label.qml
similarity index 97%
rename from interface/resources/qml/controls-uit/Label.qml
rename to interface/resources/qml/controlsUit/Label.qml
index 4c7051b495..7f208cde88 100644
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controlsUit/Label.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.7
 
-import "../styles-uit"
+import "../stylesUit"
 
 RalewaySemiBold {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/controls-uit/QueuedButton.qml b/interface/resources/qml/controlsUit/QueuedButton.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/QueuedButton.qml
rename to interface/resources/qml/controlsUit/QueuedButton.qml
index 6612d582df..70ad9eb112 100644
--- a/interface/resources/qml/controls-uit/QueuedButton.qml
+++ b/interface/resources/qml/controlsUit/QueuedButton.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 import "." as HifiControls
 
 HifiControls.Button {
diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controlsUit/RadioButton.qml
similarity index 97%
rename from interface/resources/qml/controls-uit/RadioButton.qml
rename to interface/resources/qml/controlsUit/RadioButton.qml
index 56324c55d7..ad62a77aa7 100644
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controlsUit/RadioButton.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 import TabletScriptingInterface 1.0
 
diff --git a/interface/resources/qml/controls-uit/ScrollBar.qml b/interface/resources/qml/controlsUit/ScrollBar.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/ScrollBar.qml
rename to interface/resources/qml/controlsUit/ScrollBar.qml
index 125e84e585..bcb1f62429 100644
--- a/interface/resources/qml/controls-uit/ScrollBar.qml
+++ b/interface/resources/qml/controlsUit/ScrollBar.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
+import "../stylesUit"
 
 ScrollBar {
     visible: size < 1.0
diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controlsUit/Separator.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/Separator.qml
rename to interface/resources/qml/controlsUit/Separator.qml
index 3350764ae9..da6b9adf57 100644
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controlsUit/Separator.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     property int colorScheme: 0;
diff --git a/interface/resources/qml/controls-uit/Slider.qml b/interface/resources/qml/controlsUit/Slider.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/Slider.qml
rename to interface/resources/qml/controlsUit/Slider.qml
index 2a5d4c137d..8cb08b69e2 100644
--- a/interface/resources/qml/controls-uit/Slider.qml
+++ b/interface/resources/qml/controlsUit/Slider.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Slider {
     id: slider
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controlsUit/SpinBox.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/SpinBox.qml
rename to interface/resources/qml/controlsUit/SpinBox.qml
index 3d3ea7a75e..d24c7c5e8c 100644
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controlsUit/SpinBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 SpinBox {
     id: spinBox
diff --git a/interface/resources/qml/controls-uit/Switch.qml b/interface/resources/qml/controlsUit/Switch.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Switch.qml
rename to interface/resources/qml/controlsUit/Switch.qml
index bfe86b1420..0961ef2500 100644
--- a/interface/resources/qml/controls-uit/Switch.qml
+++ b/interface/resources/qml/controlsUit/Switch.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: rootSwitch;
diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controlsUit/Table.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Table.qml
rename to interface/resources/qml/controlsUit/Table.qml
index ce4e1c376a..ab74361046 100644
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controlsUit/Table.qml
@@ -13,7 +13,7 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.3 as QQC2
 
-import "../styles-uit"
+import "../stylesUit"
 
 TableView {
     id: tableView
diff --git a/interface/resources/qml/controls-uit/TabletContentSection.qml b/interface/resources/qml/controlsUit/TabletContentSection.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/TabletContentSection.qml
rename to interface/resources/qml/controlsUit/TabletContentSection.qml
index c34f4afdd6..dccaf31bbe 100644
--- a/interface/resources/qml/controls-uit/TabletContentSection.qml
+++ b/interface/resources/qml/controlsUit/TabletContentSection.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import "../stylesUit"
 
 Column {
     property string name: "Content Section"
diff --git a/interface/resources/qml/controls-uit/TabletHeader.qml b/interface/resources/qml/controlsUit/TabletHeader.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/TabletHeader.qml
rename to interface/resources/qml/controlsUit/TabletHeader.qml
index 56203de286..f626700742 100644
--- a/interface/resources/qml/controls-uit/TabletHeader.qml
+++ b/interface/resources/qml/controlsUit/TabletHeader.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Rectangle {
 
diff --git a/interface/resources/qml/controls-uit/TextAction.qml b/interface/resources/qml/controlsUit/TextAction.qml
similarity index 96%
rename from interface/resources/qml/controls-uit/TextAction.qml
rename to interface/resources/qml/controlsUit/TextAction.qml
index 1745a6c273..a0a1bb7d07 100644
--- a/interface/resources/qml/controls-uit/TextAction.qml
+++ b/interface/resources/qml/controlsUit/TextAction.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 Item {
     property string icon: ""
diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controlsUit/TextEdit.qml
similarity index 95%
rename from interface/resources/qml/controls-uit/TextEdit.qml
rename to interface/resources/qml/controlsUit/TextEdit.qml
index a72a3b13d8..7446c5040f 100644
--- a/interface/resources/qml/controls-uit/TextEdit.qml
+++ b/interface/resources/qml/controlsUit/TextEdit.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "../stylesUit"
 
 TextEdit {
 
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controlsUit/TextField.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/TextField.qml
rename to interface/resources/qml/controlsUit/TextField.qml
index 917068ac01..d78f3a1340 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controlsUit/TextField.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import "../stylesUit"
+import "." as HifiControls
 
 TextField {
     id: textField
diff --git a/interface/resources/qml/controls-uit/ToolTip.qml b/interface/resources/qml/controlsUit/ToolTip.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/ToolTip.qml
rename to interface/resources/qml/controlsUit/ToolTip.qml
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controlsUit/Tree.qml
similarity index 99%
rename from interface/resources/qml/controls-uit/Tree.qml
rename to interface/resources/qml/controlsUit/Tree.qml
index 5199a10a27..f2c49095b1 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controlsUit/Tree.qml
@@ -15,7 +15,7 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Controls 2.2 as QQC2
 
 
-import "../styles-uit"
+import "../stylesUit"
 
 TreeView {
     id: treeView
diff --git a/interface/resources/qml/controls-uit/VerticalSpacer.qml b/interface/resources/qml/controlsUit/VerticalSpacer.qml
similarity index 94%
rename from interface/resources/qml/controls-uit/VerticalSpacer.qml
rename to interface/resources/qml/controlsUit/VerticalSpacer.qml
index 2df65f1002..4c93aa1801 100644
--- a/interface/resources/qml/controls-uit/VerticalSpacer.qml
+++ b/interface/resources/qml/controlsUit/VerticalSpacer.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import "../stylesUit"
 
 Item {
     id: root
diff --git a/interface/resources/qml/controls-uit/WebGlyphButton.qml b/interface/resources/qml/controlsUit/WebGlyphButton.qml
similarity index 98%
rename from interface/resources/qml/controls-uit/WebGlyphButton.qml
rename to interface/resources/qml/controlsUit/WebGlyphButton.qml
index fd7cd001b2..7739ecd5e7 100644
--- a/interface/resources/qml/controls-uit/WebGlyphButton.qml
+++ b/interface/resources/qml/controlsUit/WebGlyphButton.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2 as Original
 
-import "../styles-uit"
+import "../stylesUit"
 
 Original.Button {
     id: control
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controlsUit/WebSpinner.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/WebSpinner.qml
rename to interface/resources/qml/controlsUit/WebSpinner.qml
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controlsUit/WebView.qml
similarity index 100%
rename from interface/resources/qml/controls-uit/WebView.qml
rename to interface/resources/qml/controlsUit/WebView.qml
diff --git a/interface/resources/qml/controls-uit/qmldir b/interface/resources/qml/controlsUit/qmldir
similarity index 100%
rename from interface/resources/qml/controls-uit/qmldir
rename to interface/resources/qml/controlsUit/qmldir
diff --git a/interface/resources/qml/dialogs/AssetDialog.qml b/interface/resources/qml/dialogs/AssetDialog.qml
index e8d28e9b37..b8eaab0b8d 100644
--- a/interface/resources/qml/dialogs/AssetDialog.qml
+++ b/interface/resources/qml/dialogs/AssetDialog.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"
diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml
index 0c86b93c4b..026068eee1 100644
--- a/interface/resources/qml/dialogs/CustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7;
 import QtQuick.Dialogs 1.2 as OriginalDialogs;
 import QtQuick.Controls 2.3
 
-import "../controls-uit";
-import "../styles-uit";
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows";
 
 ModalWindow {
diff --git a/interface/resources/qml/dialogs/FileDialog.qml b/interface/resources/qml/dialogs/FileDialog.qml
index 6651af0db3..b7340575dd 100644
--- a/interface/resources/qml/dialogs/FileDialog.qml
+++ b/interface/resources/qml/dialogs/FileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"
diff --git a/interface/resources/qml/dialogs/MessageDialog.qml b/interface/resources/qml/dialogs/MessageDialog.qml
index b5ac6cab72..9428e3ab6e 100644
--- a/interface/resources/qml/dialogs/MessageDialog.qml
+++ b/interface/resources/qml/dialogs/MessageDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"
diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml
index fffd0e2ed9..9df1d0b963 100644
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "../windows"
 import "preferences"
 
diff --git a/interface/resources/qml/dialogs/QueryDialog.qml b/interface/resources/qml/dialogs/QueryDialog.qml
index 41ee30e6d5..9cfb3011bd 100644
--- a/interface/resources/qml/dialogs/QueryDialog.qml
+++ b/interface/resources/qml/dialogs/QueryDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 ModalWindow {
diff --git a/interface/resources/qml/dialogs/TabletAssetDialog.qml b/interface/resources/qml/dialogs/TabletAssetDialog.qml
index 897378e40c..b3bd45f972 100644
--- a/interface/resources/qml/dialogs/TabletAssetDialog.qml
+++ b/interface/resources/qml/dialogs/TabletAssetDialog.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../windows"
 
 import "assetDialog"
diff --git a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
index 81a2c5c1e0..c7772984ab 100644
--- a/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletCustomQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {
diff --git a/interface/resources/qml/dialogs/TabletFileDialog.qml b/interface/resources/qml/dialogs/TabletFileDialog.qml
index 6848c230e3..3be6e30dd0 100644
--- a/interface/resources/qml/dialogs/TabletFileDialog.qml
+++ b/interface/resources/qml/dialogs/TabletFileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "fileDialog"
diff --git a/interface/resources/qml/dialogs/TabletLoginDialog.qml b/interface/resources/qml/dialogs/TabletLoginDialog.qml
index c85b2b2ba0..6314921286 100644
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@@ -11,8 +11,8 @@
 import Hifi 1.0
 import QtQuick 2.5
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "../LoginDialog"
diff --git a/interface/resources/qml/dialogs/TabletMessageBox.qml b/interface/resources/qml/dialogs/TabletMessageBox.qml
index fabe0dd247..1e6f0734ad 100644
--- a/interface/resources/qml/dialogs/TabletMessageBox.qml
+++ b/interface/resources/qml/dialogs/TabletMessageBox.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 import "messageDialog"
diff --git a/interface/resources/qml/dialogs/TabletQueryDialog.qml b/interface/resources/qml/dialogs/TabletQueryDialog.qml
index 5746a3d67c..8f63730b8e 100644
--- a/interface/resources/qml/dialogs/TabletQueryDialog.qml
+++ b/interface/resources/qml/dialogs/TabletQueryDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import QtQuick.Controls 2.3
 
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../windows"
 
 TabletModalWindow {
diff --git a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
index c3e842bc2f..da976ef3e1 100644
--- a/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
+++ b/interface/resources/qml/dialogs/assetDialog/AssetDialogContent.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.3
 import QtQuick.Controls 1.5 as QQC1
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 import "../fileDialog"
 
diff --git a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
index 50a10974b5..6c042b5598 100644
--- a/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
+++ b/interface/resources/qml/dialogs/fileDialog/FileTypeSelection.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 ComboBox {
     id: root
diff --git a/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml b/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
index 8411980db7..f5715fa2c2 100644
--- a/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
+++ b/interface/resources/qml/dialogs/messageDialog/MessageDialogButton.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Button {
     property var dialog;
diff --git a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
index 0efc3776b3..9505e70530 100644
--- a/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/AvatarPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 import "../../hifi/tablet/tabletWindows/preferences"
 
 Preference {
diff --git a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
index 2cf50891c9..6059f8ff1c 100644
--- a/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/BrowsablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
index 454a9124ae..09c5b4329d 100644
--- a/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ButtonPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
index e2172d8eda..f6f840bbe8 100644
--- a/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/CheckBoxPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
index 3b3efaf520..98cb397976 100644
--- a/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/ComboBoxPreference.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/EditablePreference.qml b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
index 8acf8e1f76..e0c79ebba0 100644
--- a/interface/resources/qml/dialogs/preferences/EditablePreference.qml
+++ b/interface/resources/qml/dialogs/preferences/EditablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
index cfc2e94ed9..f963003c59 100644
--- a/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/PrimaryHandPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml b/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
index 103904a666..0a09d8d609 100644
--- a/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/RadioButtonsPreference.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/Section.qml b/interface/resources/qml/dialogs/preferences/Section.qml
index c2c6583b7e..a9b755ad83 100644
--- a/interface/resources/qml/dialogs/preferences/Section.qml
+++ b/interface/resources/qml/dialogs/preferences/Section.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import Hifi 1.0
 
-import "../../controls-uit" as HiFiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 import "."
 
 Preference {
diff --git a/interface/resources/qml/dialogs/preferences/SliderPreference.qml b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
index 2bdda09fc3..c8a2aae158 100644
--- a/interface/resources/qml/dialogs/preferences/SliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SliderPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
index b2c334b674..1b080c2759 100644
--- a/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinBoxPreference.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
index 126e62fc30..cbc804d9d7 100644
--- a/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
+++ b/interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../dialogs"
-import "../../controls-uit"
+import controlsUit 1.0
 
 Preference {
     id: root
diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android/ActionBar.qml
index d487901d6f..3c58156f30 100644
--- a/interface/resources/qml/hifi/+android/ActionBar.qml
+++ b/interface/resources/qml/hifi/+android/ActionBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android/AudioBar.qml
index 6cc17fccf7..912572fdf8 100644
--- a/interface/resources/qml/hifi/+android/AudioBar.qml
+++ b/interface/resources/qml/hifi/+android/AudioBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/AvatarOption.qml b/interface/resources/qml/hifi/+android/AvatarOption.qml
index 85d7e52eb2..7eba3c2a67 100644
--- a/interface/resources/qml/hifi/+android/AvatarOption.qml
+++ b/interface/resources/qml/hifi/+android/AvatarOption.qml
@@ -11,7 +11,7 @@
 
 import QtQuick.Layouts 1.3
 import QtQuick 2.5
-import "../controls-uit" as HifiControlsUit
+import controlsUit 1.0 as HifiControlsUit
 
 ColumnLayout {
     id: itemRoot
diff --git a/interface/resources/qml/hifi/+android/StatsBar.qml b/interface/resources/qml/hifi/+android/StatsBar.qml
index aee438b44f..64e93b4a08 100644
--- a/interface/resources/qml/hifi/+android/StatsBar.qml
+++ b/interface/resources/qml/hifi/+android/StatsBar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/WindowHeader.qml b/interface/resources/qml/hifi/+android/WindowHeader.qml
index 4ec0a0c6e6..5316fc4786 100644
--- a/interface/resources/qml/hifi/+android/WindowHeader.qml
+++ b/interface/resources/qml/hifi/+android/WindowHeader.qml
@@ -16,8 +16,8 @@ import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "."
 import "../styles" as HifiStyles
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/+android/bottomHudOptions.qml b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
index 22beccf531..6b830d94c2 100644
--- a/interface/resources/qml/hifi/+android/bottomHudOptions.qml
+++ b/interface/resources/qml/hifi/+android/bottomHudOptions.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
 import "../../styles" as HifiStyles
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 import "."
diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android/modesbar.qml
index 994bf1efe4..1bf04fb8d9 100644
--- a/interface/resources/qml/hifi/+android/modesbar.qml
+++ b/interface/resources/qml/hifi/+android/modesbar.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.3
 import Qt.labs.settings 1.0
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 import ".."
 
diff --git a/interface/resources/qml/hifi/AssetServer.qml b/interface/resources/qml/hifi/AssetServer.qml
index 1a7f5bac40..ad337a6361 100644
--- a/interface/resources/qml/hifi/AssetServer.qml
+++ b/interface/resources/qml/hifi/AssetServer.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../windows" as Windows
 import "../dialogs"
 
diff --git a/interface/resources/qml/hifi/Card.qml b/interface/resources/qml/hifi/Card.qml
index 83bf1e2c54..7f29324416 100644
--- a/interface/resources/qml/hifi/Card.qml
+++ b/interface/resources/qml/hifi/Card.qml
@@ -17,7 +17,7 @@ import QtGraphicalEffects 1.0
 import TabletScriptingInterface 1.0
 
 import "toolbars"
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     id: root;
diff --git a/interface/resources/qml/hifi/ComboDialog.qml b/interface/resources/qml/hifi/ComboDialog.qml
index e5dc8a9c1a..74d9c1019b 100644
--- a/interface/resources/qml/hifi/ComboDialog.qml
+++ b/interface/resources/qml/hifi/ComboDialog.qml
@@ -10,8 +10,8 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
-import "../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 
 Item {
     property var dialogTitleText : "";
diff --git a/interface/resources/qml/hifi/Desktop.qml b/interface/resources/qml/hifi/Desktop.qml
index 4d342fe775..511d9377e5 100644
--- a/interface/resources/qml/hifi/Desktop.qml
+++ b/interface/resources/qml/hifi/Desktop.qml
@@ -8,7 +8,7 @@ import "../desktop" as OriginalDesktop
 import ".."
 import "."
 import "./toolbars"
-import "../controls-uit"
+import controlsUit 1.0
 
 OriginalDesktop.Desktop {
     id: desktop
diff --git a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
index 9e9dcc75b2..048add24e5 100644
--- a/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
+++ b/interface/resources/qml/hifi/DesktopLetterboxMessage.qml
@@ -10,7 +10,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     property alias text: popupText.text
diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index 346481fe1f..4cfd4804b3 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -15,7 +15,7 @@ import Hifi 1.0
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import "toolbars"
-import "../styles-uit"
+import stylesUit 1.0
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
 Column {
diff --git a/interface/resources/qml/hifi/LetterboxMessage.qml b/interface/resources/qml/hifi/LetterboxMessage.qml
index 8a18d88842..68bebdd041 100644
--- a/interface/resources/qml/hifi/LetterboxMessage.qml
+++ b/interface/resources/qml/hifi/LetterboxMessage.qml
@@ -10,7 +10,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import stylesUit 1.0
 
 Item {
     property alias text: popupText.text
diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index dfa6555150..242ca5ab57 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -13,8 +13,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
 import QtGraphicalEffects 1.0
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "toolbars"
 
 // references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager, Account from root context
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 1384cb8711..368beaab47 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -15,8 +15,8 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtGraphicalEffects 1.0
 import Qt.labs.settings 1.0
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
diff --git a/interface/resources/qml/hifi/SkyboxChanger.qml b/interface/resources/qml/hifi/SkyboxChanger.qml
index f0c97a11a3..a66fc38415 100644
--- a/interface/resources/qml/hifi/SkyboxChanger.qml
+++ b/interface/resources/qml/hifi/SkyboxChanger.qml
@@ -10,8 +10,8 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import QtQuick.Controls 2.2
 
 Item {
diff --git a/interface/resources/qml/hifi/SpectatorCamera.qml b/interface/resources/qml/hifi/SpectatorCamera.qml
index 4bf80e410b..09b722b906 100644
--- a/interface/resources/qml/hifi/SpectatorCamera.qml
+++ b/interface/resources/qml/hifi/SpectatorCamera.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
-import "../styles-uit"
-import "../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../controls" as HifiControls
 
 // references HMD, XXX from root context
diff --git a/interface/resources/qml/hifi/TabletTextButton.qml b/interface/resources/qml/hifi/TabletTextButton.qml
index e5ff1d381d..6c9e0331df 100644
--- a/interface/resources/qml/hifi/TabletTextButton.qml
+++ b/interface/resources/qml/hifi/TabletTextButton.qml
@@ -10,7 +10,7 @@
 
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text
diff --git a/interface/resources/qml/hifi/TextButton.qml b/interface/resources/qml/hifi/TextButton.qml
index 02e49d86e4..61588a9603 100644
--- a/interface/resources/qml/hifi/TextButton.qml
+++ b/interface/resources/qml/hifi/TextButton.qml
@@ -9,7 +9,7 @@
 //
 import Hifi 1.0
 import QtQuick 2.4
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     property alias text: label.text;
diff --git a/interface/resources/qml/hifi/WebBrowser.qml b/interface/resources/qml/hifi/WebBrowser.qml
index ab93752d92..c05de26471 100644
--- a/interface/resources/qml/hifi/WebBrowser.qml
+++ b/interface/resources/qml/hifi/WebBrowser.qml
@@ -18,8 +18,8 @@ import QtGraphicalEffects 1.0
 import QtWebEngine 1.5
 import QtWebChannel 1.0
 
-import "../styles-uit"
-import "../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../windows"
 import "../controls"
 
diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index f4a708567a..c8dd83cd62 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -15,8 +15,8 @@ import QtQuick 2.5
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "./" as AudioControls
 
diff --git a/interface/resources/qml/hifi/audio/AudioTabButton.qml b/interface/resources/qml/hifi/audio/AudioTabButton.qml
index 3a3ed90f5e..32331ccb6e 100644
--- a/interface/resources/qml/hifi/audio/AudioTabButton.qml
+++ b/interface/resources/qml/hifi/audio/AudioTabButton.qml
@@ -11,8 +11,8 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabButton {
     id: control
diff --git a/interface/resources/qml/hifi/audio/CheckBox.qml b/interface/resources/qml/hifi/audio/CheckBox.qml
index 3a954d4004..5ab62a5091 100644
--- a/interface/resources/qml/hifi/audio/CheckBox.qml
+++ b/interface/resources/qml/hifi/audio/CheckBox.qml
@@ -11,7 +11,7 @@
 
 import QtQuick 2.7
 
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 HifiControls.CheckBoxQQC2 {
     color: "white"
diff --git a/interface/resources/qml/hifi/audio/PlaySampleSound.qml b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
index 2b9599a3cc..cfe55af9c4 100644
--- a/interface/resources/qml/hifi/audio/PlaySampleSound.qml
+++ b/interface/resources/qml/hifi/audio/PlaySampleSound.qml
@@ -13,8 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 RowLayout {
     property var sound: null;
diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 271aab87d1..2cf176c1e5 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 1.4
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 import "../common" as HifiCommerceCommon
diff --git a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
index 5901adc484..b7215500d2 100644
--- a/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
+++ b/interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "qrc:////qml//styles-uit"
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 99c2d89da8..0d0af875d1 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
index 0b982893f1..c2d85b68b4 100644
--- a/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
+++ b/interface/resources/qml/hifi/commerce/common/FirstUseTutorial.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
index 41eacd68d5..1eb8af31e6 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/ConnectionItem.qml
@@ -16,8 +16,8 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../../wallet" as HifiWallet
 
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
index 9293dc83ab..9e1a967d50 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/RecipientDisplay.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.6
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
index bb4bb624bc..ec7146f33e 100644
--- a/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
+++ b/interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.6
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
-import "../../../../styles-uit"
-import "../../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../../controls" as HifiControls
 import "../" as HifiCommerceCommon
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
diff --git a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
index 885838a26e..8d0b93d11a 100644
--- a/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
+++ b/interface/resources/qml/hifi/commerce/inspectionCertificate/InspectionCertificate.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 
diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
index 0828d86eff..c8ec7238d6 100644
--- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Controls.Styles 1.4
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../wallet" as HifiWallet
 import TabletScriptingInterface 1.0
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index e7b541b350..932a3ab6c4 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 import "../wallet" as HifiWallet
diff --git a/interface/resources/qml/hifi/commerce/wallet/Help.qml b/interface/resources/qml/hifi/commerce/wallet/Help.qml
index 575edfc34d..1598aec41c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Help.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Help.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
index 03af964830..ab05f55deb 100644
--- a/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/NeedsLogIn.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
index 8451c90836..6ddfe0da1c 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseChange.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
index c4abd40d2a..86d50e87ec 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
index e052b78876..179ffcf707 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseSelection.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
index f44e715703..ed4ba66b2b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/Wallet.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 import "../common/sendAsset"
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
index 19065ee542..e7163a3641 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletChoice.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import "../common" as HifiCommerceCommon
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 
 Item {
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
index d32017189e..f18d4c7b44 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletHome.qml
@@ -15,8 +15,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 import QtQuick.Controls 2.2
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "qrc:////qml//hifi//models" as HifiModels  // Absolute path so the same code works everywhere.
 
diff --git a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
index ecd7234400..1cecebc41b 100644
--- a/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../../controls" as HifiControls
 import "../common" as HifiCommerceCommon
 
diff --git a/interface/resources/qml/hifi/dialogs/AboutDialog.qml b/interface/resources/qml/hifi/dialogs/AboutDialog.qml
index b8e6e89aec..3d5d1a94a3 100644
--- a/interface/resources/qml/hifi/dialogs/AboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/AboutDialog.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.8
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../windows"
 
 ScrollingWindow {
diff --git a/interface/resources/qml/hifi/dialogs/RunningScripts.qml b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
index 9a180a66f6..be17e65ab3 100644
--- a/interface/resources/qml/hifi/dialogs/RunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/RunningScripts.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "../"
 
diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
index 579aa1cb1e..d26bf81e57 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     width: 480
diff --git a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
index 0eeb252049..f665032b01 100644
--- a/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletAssetServer.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls.Styles 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import ".."
 
diff --git a/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml b/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
index afe06897df..763f56b92b 100644
--- a/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletDCDialog.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
index 50df4dedbc..213dca8b48 100644
--- a/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletDebugWindow.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import Hifi 1.0 as Hifi
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Rectangle {
     id: root
diff --git a/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml b/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
index 24798af21a..4cfc99e0eb 100644
--- a/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletEntityStatistics.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml b/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
index d5c5a5ee02..e86dfd7554 100644
--- a/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletEntityStatisticsItem.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Column {
     id: root
diff --git a/interface/resources/qml/hifi/dialogs/TabletLODTools.qml b/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
index ab53f03477..bb3d668850 100644
--- a/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletLODTools.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
index 018c8f5737..6cd220307d 100644
--- a/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
+++ b/interface/resources/qml/hifi/dialogs/TabletRunningScripts.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 import Qt.labs.settings 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "../"
 
diff --git a/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml b/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
index ce1abc6154..b1aa8e5c45 100644
--- a/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
+++ b/interface/resources/qml/hifi/dialogs/content/ModelBrowserContent.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.7
 import QtQuick.Controls 2.3
 
-import "../../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 Column {
     width: pane.contentWidth
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
index 96d75e340b..82d094144d 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageChange.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
index f058aad40a..366372622c 100644
--- a/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
+++ b/interface/resources/qml/hifi/dialogs/security/SecurityImageSelection.qml
@@ -13,8 +13,8 @@
 
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 
 // references XXX from root context
diff --git a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
index e3115a5738..6b2aa331e8 100644
--- a/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
+++ b/interface/resources/qml/hifi/tablet/CalibratingScreen.qml
@@ -10,9 +10,9 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/ControllerSettings.qml b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
index 6706830537..b8bbd71f33 100644
--- a/interface/resources/qml/hifi/tablet/ControllerSettings.qml
+++ b/interface/resources/qml/hifi/tablet/ControllerSettings.qml
@@ -11,9 +11,9 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtGraphicalEffects 1.0
 import Qt.labs.settings 1.0
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "../../dialogs"
 import "../../dialogs/preferences"
 import "tabletWindows"
diff --git a/interface/resources/qml/hifi/tablet/EditTabButton.qml b/interface/resources/qml/hifi/tablet/EditTabButton.qml
index 13894f4d15..5fc4341eb8 100644
--- a/interface/resources/qml/hifi/tablet/EditTabButton.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabButton.qml
@@ -11,8 +11,8 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabButton {
     id: control
diff --git a/interface/resources/qml/hifi/tablet/EditTabView.qml b/interface/resources/qml/hifi/tablet/EditTabView.qml
index bf7dd3e66b..d9549feeb0 100644
--- a/interface/resources/qml/hifi/tablet/EditTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditTabView.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabBar {
     id: editTabView
diff --git a/interface/resources/qml/hifi/tablet/InputRecorder.qml b/interface/resources/qml/hifi/tablet/InputRecorder.qml
index 527a6cacb4..9b63a612a8 100644
--- a/interface/resources/qml/hifi/tablet/InputRecorder.qml
+++ b/interface/resources/qml/hifi/tablet/InputRecorder.qml
@@ -9,8 +9,8 @@
 import QtQuick 2.5
 import Hifi 1.0
 
-import "../../styles-uit"
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../../windows"
 import "../../dialogs"
 
diff --git a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
index 526a42f8e2..dde372648b 100644
--- a/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewMaterialDialog.qml
@@ -13,8 +13,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../../styles-uit"
-import "../../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 import "../dialogs"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/NewModelDialog.qml b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
index 553a4fd59f..9540979479 100644
--- a/interface/resources/qml/hifi/tablet/NewModelDialog.qml
+++ b/interface/resources/qml/hifi/tablet/NewModelDialog.qml
@@ -12,8 +12,8 @@
 import QtQuick 2.5
 import QtQuick.Dialogs 1.2 as OriginalDialogs
 
-import "../../styles-uit"
-import "../../controls-uit"
+import stylesUit 1.0
+import controlsUit 1.0
 import "../dialogs"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
index f91642105f..2fc5cc4196 100644
--- a/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
+++ b/interface/resources/qml/hifi/tablet/OpenVrConfiguration.qml
@@ -9,9 +9,9 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
-import "../../controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 import "."
 
 
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 3d518289fb..0f26ba20aa 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -18,8 +18,8 @@ import "../../styles"
 import "../../windows"
 import "../"
 import "../toolbars"
-import "../../styles-uit" as HifiStyles
-import "../../controls-uit" as HifiControls
+import stylesUit 1.0 as HifiStyles
+import controlsUit 1.0 as HifiControls
 import QtQuick.Controls 2.2 as QQC2
 import QtQuick.Templates 2.2 as T
 
diff --git a/interface/resources/qml/hifi/tablet/TabletHome.qml b/interface/resources/qml/hifi/tablet/TabletHome.qml
index 1922b02f93..934ed91995 100644
--- a/interface/resources/qml/hifi/tablet/TabletHome.qml
+++ b/interface/resources/qml/hifi/tablet/TabletHome.qml
@@ -6,7 +6,7 @@ import QtQuick.Layouts 1.3
 import TabletScriptingInterface 1.0
 
 import "."
-import "../../styles-uit"
+import stylesUit 1.0
 import "../audio" as HifiAudio
 
 Item {
diff --git a/interface/resources/qml/hifi/tablet/TabletMenu.qml b/interface/resources/qml/hifi/tablet/TabletMenu.qml
index 6540d53fca..267fb9f0cf 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenu.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenu.qml
@@ -7,7 +7,7 @@ import QtWebEngine  1.1
 
 
 import "."
-import "../../styles-uit"
+import stylesUit 1.0
 import "../../controls"
 
 FocusScope {
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
index 74f175e049..25db90c771 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuItem.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/qml/hifi/tablet/TabletMenuView.qml b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
index b632a17e57..73b0405984 100644
--- a/interface/resources/qml/hifi/tablet/TabletMenuView.qml
+++ b/interface/resources/qml/hifi/tablet/TabletMenuView.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import TabletScriptingInterface 1.0
 
-import "../../styles-uit"
+import stylesUit 1.0
 import "."
 
 FocusScope {
diff --git a/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml b/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
index d69d760b95..ce4e641476 100644
--- a/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletModelBrowserDialog.qml
@@ -10,8 +10,8 @@
 
 import QtQuick 2.5
 
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "../dialogs/content"
 
 Item {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
index 871d1c92a9..8e91655dda 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletFileDialog.qml
@@ -16,8 +16,8 @@ import QtQuick.Controls 1.4 as QQC1
 import QtQuick.Controls 2.3
 
 import ".."
-import "../../../controls-uit"
-import "../../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../../../windows"
 
 import "../../../dialogs/fileDialog"
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
index 3708f75114..57ca705352 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 
 import "."
 import "./preferences"
-import "../../../styles-uit"
-import "../../../controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: dialog
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
index 6ac3f706e4..57fdeb482b 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
@@ -12,8 +12,8 @@ import QtQuick 2.5
 import Hifi 1.0
 
 import "../../../../dialogs/preferences"
-import "../../../../controls-uit" as HiFiControls
-import "../../../../styles-uit"
+import controlsUit 1.0 as HiFiControls
+import stylesUit 1.0
 import "."
 
 Preference {
diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
index 8c0e934971..36b927f5f9 100644
--- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
+++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletBrowsablePreference.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "../../../../dialogs"
-import "../../../../controls-uit"
+import controlsUit 1.0
 import "../"
 
 Preference {
diff --git a/interface/resources/qml/styles-uit/+android/HifiConstants.qml b/interface/resources/qml/stylesUit/+android/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/+android/HifiConstants.qml
rename to interface/resources/qml/stylesUit/+android/HifiConstants.qml
diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/stylesUit/AnonymousProRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/AnonymousProRegular.qml
rename to interface/resources/qml/stylesUit/AnonymousProRegular.qml
diff --git a/interface/resources/qml/styles-uit/ButtonLabel.qml b/interface/resources/qml/stylesUit/ButtonLabel.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ButtonLabel.qml
rename to interface/resources/qml/stylesUit/ButtonLabel.qml
diff --git a/interface/resources/qml/styles-uit/FiraSansRegular.qml b/interface/resources/qml/stylesUit/FiraSansRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/FiraSansRegular.qml
rename to interface/resources/qml/stylesUit/FiraSansRegular.qml
diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/stylesUit/FiraSansSemiBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/FiraSansSemiBold.qml
rename to interface/resources/qml/stylesUit/FiraSansSemiBold.qml
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/stylesUit/HiFiGlyphs.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/HiFiGlyphs.qml
rename to interface/resources/qml/stylesUit/HiFiGlyphs.qml
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/stylesUit/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/HifiConstants.qml
rename to interface/resources/qml/stylesUit/HifiConstants.qml
diff --git a/interface/resources/qml/styles-uit/IconButton.qml b/interface/resources/qml/stylesUit/IconButton.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/IconButton.qml
rename to interface/resources/qml/stylesUit/IconButton.qml
diff --git a/interface/resources/qml/styles-uit/InfoItem.qml b/interface/resources/qml/stylesUit/InfoItem.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/InfoItem.qml
rename to interface/resources/qml/stylesUit/InfoItem.qml
diff --git a/interface/resources/qml/styles-uit/InputLabel.qml b/interface/resources/qml/stylesUit/InputLabel.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/InputLabel.qml
rename to interface/resources/qml/stylesUit/InputLabel.qml
diff --git a/interface/resources/qml/styles-uit/ListItem.qml b/interface/resources/qml/stylesUit/ListItem.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ListItem.qml
rename to interface/resources/qml/stylesUit/ListItem.qml
diff --git a/interface/resources/qml/styles-uit/Logs.qml b/interface/resources/qml/stylesUit/Logs.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/Logs.qml
rename to interface/resources/qml/stylesUit/Logs.qml
diff --git a/interface/resources/qml/styles-uit/OverlayTitle.qml b/interface/resources/qml/stylesUit/OverlayTitle.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/OverlayTitle.qml
rename to interface/resources/qml/stylesUit/OverlayTitle.qml
diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/stylesUit/RalewayBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayBold.qml
rename to interface/resources/qml/stylesUit/RalewayBold.qml
diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/stylesUit/RalewayLight.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayLight.qml
rename to interface/resources/qml/stylesUit/RalewayLight.qml
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/stylesUit/RalewayRegular.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewayRegular.qml
rename to interface/resources/qml/stylesUit/RalewayRegular.qml
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/stylesUit/RalewaySemiBold.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/RalewaySemiBold.qml
rename to interface/resources/qml/stylesUit/RalewaySemiBold.qml
diff --git a/interface/resources/qml/styles-uit/SectionName.qml b/interface/resources/qml/stylesUit/SectionName.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/SectionName.qml
rename to interface/resources/qml/stylesUit/SectionName.qml
diff --git a/interface/resources/qml/styles-uit/Separator.qml b/interface/resources/qml/stylesUit/Separator.qml
similarity index 97%
rename from interface/resources/qml/styles-uit/Separator.qml
rename to interface/resources/qml/stylesUit/Separator.qml
index 4134b928a7..d9f11e192c 100644
--- a/interface/resources/qml/styles-uit/Separator.qml
+++ b/interface/resources/qml/stylesUit/Separator.qml
@@ -9,7 +9,7 @@
 //
 
 import QtQuick 2.5
-import "../styles-uit"
+import "."
 
 Item {
     // Size
diff --git a/interface/resources/qml/styles-uit/ShortcutText.qml b/interface/resources/qml/stylesUit/ShortcutText.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/ShortcutText.qml
rename to interface/resources/qml/stylesUit/ShortcutText.qml
diff --git a/interface/resources/qml/styles-uit/TabName.qml b/interface/resources/qml/stylesUit/TabName.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/TabName.qml
rename to interface/resources/qml/stylesUit/TabName.qml
diff --git a/interface/resources/qml/styles-uit/TextFieldInput.qml b/interface/resources/qml/stylesUit/TextFieldInput.qml
similarity index 100%
rename from interface/resources/qml/styles-uit/TextFieldInput.qml
rename to interface/resources/qml/stylesUit/TextFieldInput.qml
diff --git a/interface/resources/qml/styles-uit/qmldir b/interface/resources/qml/stylesUit/qmldir
similarity index 100%
rename from interface/resources/qml/styles-uit/qmldir
rename to interface/resources/qml/stylesUit/qmldir
diff --git a/interface/resources/qml/windows/Decoration.qml b/interface/resources/qml/windows/Decoration.qml
index f8fd9f4e6c..efaea6be8a 100644
--- a/interface/resources/qml/windows/Decoration.qml
+++ b/interface/resources/qml/windows/Decoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Rectangle {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/DefaultFrame.qml b/interface/resources/qml/windows/DefaultFrame.qml
index 60e744bec3..5a366e367b 100644
--- a/interface/resources/qml/windows/DefaultFrame.qml
+++ b/interface/resources/qml/windows/DefaultFrame.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/DefaultFrameDecoration.qml b/interface/resources/qml/windows/DefaultFrameDecoration.qml
index 1ddd83976e..fb0dd55985 100644
--- a/interface/resources/qml/windows/DefaultFrameDecoration.qml
+++ b/interface/resources/qml/windows/DefaultFrameDecoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Decoration {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/Fadable.qml b/interface/resources/qml/windows/Fadable.qml
index 406c6be556..6d88fb067a 100644
--- a/interface/resources/qml/windows/Fadable.qml
+++ b/interface/resources/qml/windows/Fadable.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 
-import "../styles-uit"
+import stylesUit 1.0
 
 // Enable window visibility transitions
 FocusScope {
diff --git a/interface/resources/qml/windows/Frame.qml b/interface/resources/qml/windows/Frame.qml
index 271d4f2e07..7b0fbf8d8c 100644
--- a/interface/resources/qml/windows/Frame.qml
+++ b/interface/resources/qml/windows/Frame.qml
@@ -11,7 +11,7 @@
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
-import "../styles-uit"
+import stylesUit 1.0
 import "../js/Utils.js" as Utils
 
 Item {
diff --git a/interface/resources/qml/windows/ModalFrame.qml b/interface/resources/qml/windows/ModalFrame.qml
index cb23ccd5ad..ae149224e3 100644
--- a/interface/resources/qml/windows/ModalFrame.qml
+++ b/interface/resources/qml/windows/ModalFrame.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 
 import "."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/ScrollingWindow.qml b/interface/resources/qml/windows/ScrollingWindow.qml
index c156b80388..4cab96701e 100644
--- a/interface/resources/qml/windows/ScrollingWindow.qml
+++ b/interface/resources/qml/windows/ScrollingWindow.qml
@@ -14,8 +14,8 @@ import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
-import "../controls-uit" as HiFiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HiFiControls
 
 // FIXME how do I set the initial position of a window without
 // overriding places where the a individual client of the window
diff --git a/interface/resources/qml/windows/TabletModalFrame.qml b/interface/resources/qml/windows/TabletModalFrame.qml
index 550eec8357..1e9310eb5a 100644
--- a/interface/resources/qml/windows/TabletModalFrame.qml
+++ b/interface/resources/qml/windows/TabletModalFrame.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 
 import "."
-import "../controls-uit"
-import "../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 
 Rectangle {
diff --git a/interface/resources/qml/windows/ToolFrame.qml b/interface/resources/qml/windows/ToolFrame.qml
index 20c86afb5e..bb2bada498 100644
--- a/interface/resources/qml/windows/ToolFrame.qml
+++ b/interface/resources/qml/windows/ToolFrame.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Frame {
     HifiConstants { id: hifi }
diff --git a/interface/resources/qml/windows/ToolFrameDecoration.qml b/interface/resources/qml/windows/ToolFrameDecoration.qml
index ba36a2a38c..4f149037b3 100644
--- a/interface/resources/qml/windows/ToolFrameDecoration.qml
+++ b/interface/resources/qml/windows/ToolFrameDecoration.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 Decoration {
     id: root
diff --git a/interface/resources/qml/windows/Window.qml b/interface/resources/qml/windows/Window.qml
index 835967c628..9f180af55d 100644
--- a/interface/resources/qml/windows/Window.qml
+++ b/interface/resources/qml/windows/Window.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtGraphicalEffects 1.0
 
 import "."
-import "../styles-uit"
+import stylesUit 1.0
 
 // FIXME how do I set the initial position of a window without
 // overriding places where the a individual client of the window
diff --git a/libraries/ui/src/ui/OffscreenQmlSurface.cpp b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
index 74098f69c7..f67a356078 100644
--- a/libraries/ui/src/ui/OffscreenQmlSurface.cpp
+++ b/libraries/ui/src/ui/OffscreenQmlSurface.cpp
@@ -250,6 +250,7 @@ void OffscreenQmlSurface::initializeEngine(QQmlEngine* engine) {
 
     engine->setNetworkAccessManagerFactory(new QmlNetworkAccessManagerFactory);
     auto importList = engine->importPathList();
+    importList.insert(importList.begin(), PathUtils::resourcesPath() + "qml/");
     importList.insert(importList.begin(), PathUtils::resourcesPath());
     engine->setImportPathList(importList);
     for (const auto& path : importList) {
diff --git a/scripts/developer/tests/ControlsGallery.qml b/scripts/developer/tests/ControlsGallery.qml
index ceb8a26dc9..9685fa6fe8 100644
--- a/scripts/developer/tests/ControlsGallery.qml
+++ b/scripts/developer/tests/ControlsGallery.qml
@@ -2,16 +2,9 @@ import QtQuick 2.10
 import QtQuick.Window 2.10
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
 
-//uncomment to use from qmlscratch tool
-//import '../../../interface/resources/qml/controls-uit' as HifiControlsUit
-//import '../../../interface/resources/qml/styles-uit'
-
-//uncomment to use with HIFI_USE_SOURCE_TREE_RESOURCES=1
-//import '../../../resources/qml/controls-uit' as HifiControlsUit
-//import '../../../resources/qml/styles-uit'
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 
 Item {
     visible: true

From d0ac5128b02316817a52d8da76276757f99532e3 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Sun, 17 Jun 2018 14:53:52 +0300
Subject: [PATCH 64/73] repurpose qmlscratch into 'controls gallery' launcher

---
 tests-manual/ui/qml/ControlsGalleryWindow.qml |  14 +
 tests-manual/ui/qml/Palettes.qml              | 150 ----
 tests-manual/ui/qml/ScrollingGraph.qml        | 111 ---
 tests-manual/ui/qml/StubMenu.qml              | 730 ------------------
 tests-manual/ui/qml/Stubs.qml                 | 346 ---------
 tests-manual/ui/qml/TestControllers.qml       | 160 ----
 tests-manual/ui/qml/TestDialog.qml            |  94 ---
 tests-manual/ui/qml/TestMenu.qml              |  10 -
 tests-manual/ui/qml/TestRoot.qml              |  43 --
 .../ui/qml/controlDemo/ButtonPage.qml         | 128 ---
 tests-manual/ui/qml/controlDemo/InputPage.qml | 114 ---
 .../ui/qml/controlDemo/ProgressPage.qml       |  90 ---
 tests-manual/ui/qml/controlDemo/main.qml      | 161 ----
 tests-manual/ui/qml/main.qml                  | 461 -----------
 tests-manual/ui/qmlscratch.pro                |  28 +-
 tests-manual/ui/src/main.cpp                  | 125 +--
 16 files changed, 40 insertions(+), 2725 deletions(-)
 create mode 100644 tests-manual/ui/qml/ControlsGalleryWindow.qml
 delete mode 100644 tests-manual/ui/qml/Palettes.qml
 delete mode 100644 tests-manual/ui/qml/ScrollingGraph.qml
 delete mode 100644 tests-manual/ui/qml/StubMenu.qml
 delete mode 100644 tests-manual/ui/qml/Stubs.qml
 delete mode 100644 tests-manual/ui/qml/TestControllers.qml
 delete mode 100644 tests-manual/ui/qml/TestDialog.qml
 delete mode 100644 tests-manual/ui/qml/TestMenu.qml
 delete mode 100644 tests-manual/ui/qml/TestRoot.qml
 delete mode 100644 tests-manual/ui/qml/controlDemo/ButtonPage.qml
 delete mode 100644 tests-manual/ui/qml/controlDemo/InputPage.qml
 delete mode 100644 tests-manual/ui/qml/controlDemo/ProgressPage.qml
 delete mode 100644 tests-manual/ui/qml/controlDemo/main.qml
 delete mode 100644 tests-manual/ui/qml/main.qml

diff --git a/tests-manual/ui/qml/ControlsGalleryWindow.qml b/tests-manual/ui/qml/ControlsGalleryWindow.qml
new file mode 100644
index 0000000000..32fd62da36
--- /dev/null
+++ b/tests-manual/ui/qml/ControlsGalleryWindow.qml
@@ -0,0 +1,14 @@
+import QtQuick 2.0
+import QtQuick.Window 2.3
+import QtQuick.Controls 1.4
+import '../../../scripts/developer/tests' as Tests
+
+ApplicationWindow {
+    width: 640
+    height: 480
+    visible: true
+
+    Tests.ControlsGallery {
+        anchors.fill: parent
+    }
+}
diff --git a/tests-manual/ui/qml/Palettes.qml b/tests-manual/ui/qml/Palettes.qml
deleted file mode 100644
index 2bdf6eba8b..0000000000
--- a/tests-manual/ui/qml/Palettes.qml
+++ /dev/null
@@ -1,150 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-
-Rectangle {
-    color: "teal"
-    height: 512
-    width: 192
-    SystemPalette { id: sp; colorGroup: SystemPalette.Active }
-    SystemPalette { id: spi; colorGroup: SystemPalette.Inactive }
-    SystemPalette { id: spd; colorGroup: SystemPalette.Disabled }
-
-    Column {
-        anchors.margins: 8
-        anchors.fill: parent
-        spacing: 8
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "base" }
-            Rectangle { height: parent.height; width: 16; color: sp.base }
-            Rectangle { height: parent.height; width: 16; color: spi.base }
-            Rectangle { height: parent.height; width: 16; color: spd.base }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "alternateBase" }
-            Rectangle { height: parent.height; width: 16; color: sp.alternateBase }
-            Rectangle { height: parent.height; width: 16; color: spi.alternateBase }
-            Rectangle { height: parent.height; width: 16; color: spd.alternateBase }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "dark" }
-            Rectangle { height: parent.height; width: 16; color: sp.dark }
-            Rectangle { height: parent.height; width: 16; color: spi.dark }
-            Rectangle { height: parent.height; width: 16; color: spd.dark }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "mid" }
-            Rectangle { height: parent.height; width: 16; color: sp.mid }
-            Rectangle { height: parent.height; width: 16; color: spi.mid }
-            Rectangle { height: parent.height; width: 16; color: spd.mid }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "mid light" }
-            Rectangle { height: parent.height; width: 16; color: sp.midlight }
-            Rectangle { height: parent.height; width: 16; color: spi.midlight }
-            Rectangle { height: parent.height; width: 16; color: spd.midlight }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "light" }
-            Rectangle { height: parent.height; width: 16; color: sp.light}
-            Rectangle { height: parent.height; width: 16; color: spi.light}
-            Rectangle { height: parent.height; width: 16; color: spd.light}
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "shadow" }
-            Rectangle { height: parent.height; width: 16; color: sp.shadow}
-            Rectangle { height: parent.height; width: 16; color: spi.shadow}
-            Rectangle { height: parent.height; width: 16; color: spd.shadow}
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "text" }
-            Rectangle { height: parent.height; width: 16; color: sp.text }
-            Rectangle { height: parent.height; width: 16; color: spi.text }
-            Rectangle { height: parent.height; width: 16; color: spd.text }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "window" }
-            Rectangle { height: parent.height; width: 16; color: sp.window }
-            Rectangle { height: parent.height; width: 16; color: spi.window }
-            Rectangle { height: parent.height; width: 16; color: spd.window }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "window text" }
-            Rectangle { height: parent.height; width: 16; color: sp.windowText }
-            Rectangle { height: parent.height; width: 16; color: spi.windowText }
-            Rectangle { height: parent.height; width: 16; color: spd.windowText }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "button" }
-            Rectangle { height: parent.height; width: 16; color: sp.button }
-            Rectangle { height: parent.height; width: 16; color: spi.button }
-            Rectangle { height: parent.height; width: 16; color: spd.button }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "buttonText" }
-            Rectangle { height: parent.height; width: 16; color: sp.buttonText }
-            Rectangle { height: parent.height; width: 16; color: spi.buttonText }
-            Rectangle { height: parent.height; width: 16; color: spd.buttonText }
-        }
-        Item {
-            height: 16
-            width:parent.width
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "highlight" }
-            Rectangle { height: parent.height; width: 16; color: sp.highlight }
-            Rectangle { height: parent.height; width: 16; color: spi.highlight }
-            Rectangle { height: parent.height; width: 16; color: spd.highlight }
-        }
-        Row {
-            width: parent.width
-            height: 16
-            Text { height: parent.height;  width: 128; text: "highlighted text" }
-            Rectangle { height: parent.height; width: 16; color: sp.highlightedText}
-            Rectangle { height: parent.height; width: 16; color: spi.highlightedText}
-            Rectangle { height: parent.height; width: 16; color: spd.highlightedText}
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/ScrollingGraph.qml b/tests-manual/ui/qml/ScrollingGraph.qml
deleted file mode 100644
index 55523a23f4..0000000000
--- a/tests-manual/ui/qml/ScrollingGraph.qml
+++ /dev/null
@@ -1,111 +0,0 @@
-import QtQuick 2.1
-import QtQuick.Controls 1.0
-import QtQuick.Layouts 1.0
-import QtQuick.Dialogs 1.0
-
-Rectangle {
-    id: root
-    property int size: 64
-    width: size
-    height: size
-    color: 'black'
-    property int controlId: 0
-    property real value: 0.5
-    property int scrollWidth: 1
-    property real min: 0.0
-    property real max: 1.0
-    property bool log: false
-    property real range: max - min
-    property color lineColor: 'yellow'
-    property bool bar: false
-    property real lastHeight: -1
-    property string label: ""
-
-    function update() {
-        value = Controller.getValue(controlId);
-        if (log) {
-            var log = Math.log(10) / Math.log(Math.abs(value));
-            var sign = Math.sign(value);
-            value = log * sign;
-        }
-        canvas.requestPaint();
-    }
-
-    function drawHeight() {
-        if (value < min) {
-            return 0;
-        }
-        if (value > max) {
-            return height;
-        }
-        return ((value - min) / range) * height;
-    }
-
-    Timer {
-        interval: 50; running: true; repeat: true
-        onTriggered: root.update()
-    }
-
-    Canvas {
-       id: canvas
-       anchors.fill: parent
-       antialiasing: false
-
-       Text {
-           anchors.top: parent.top
-           text: root.label
-           color: 'white'
-       }
-
-       Text {
-           anchors.right: parent.right
-           anchors.top: parent.top
-           text: root.max
-           color: 'white'
-       }
-
-       Text {
-           anchors.right: parent.right
-           anchors.bottom: parent.bottom
-           text: root.min
-           color: 'white'
-       }
-
-       function scroll() {
-           var ctx = canvas.getContext('2d');
-           var image = ctx.getImageData(0, 0, canvas.width, canvas.height);
-           ctx.beginPath();
-           ctx.clearRect(0, 0, canvas.width, canvas.height);
-           ctx.drawImage(image, -root.scrollWidth, 0, canvas.width, canvas.height)
-           ctx.restore()
-       }
-
-       onPaint: {
-           scroll();
-           var ctx = canvas.getContext('2d');
-           ctx.save();
-           var currentHeight = root.drawHeight();
-           if (root.lastHeight == -1) {
-               root.lastHeight = currentHeight
-           }
-
-//           var x = canvas.width - root.drawWidth;
-//           var y = canvas.height - drawHeight;
-//           ctx.fillStyle = root.color
-//           ctx.fillRect(x, y, root.drawWidth, root.bar ? drawHeight : 1)
-//           ctx.fill();
-//           ctx.restore()
-
-
-           ctx.beginPath();
-           ctx.lineWidth = 1
-           ctx.strokeStyle = root.lineColor
-           ctx.moveTo(canvas.width - root.scrollWidth, root.lastHeight).lineTo(canvas.width, currentHeight)
-           ctx.stroke()
-           ctx.restore()
-           root.lastHeight = currentHeight
-       }
-    }
-}
-
-
diff --git a/tests-manual/ui/qml/StubMenu.qml b/tests-manual/ui/qml/StubMenu.qml
deleted file mode 100644
index fd0298988a..0000000000
--- a/tests-manual/ui/qml/StubMenu.qml
+++ /dev/null
@@ -1,730 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-import "../../../interface/resources/qml/hifi"
-
-Menu {
-    property var menuOption: MenuOption {}
-    Item {
-        Action {
-            id: login;
-            text: menuOption.login
-        }
-        Action {
-            id: update;
-            text: "Update";
-            enabled: false
-        }
-        Action {
-            id: crashReporter;
-            text: "Crash Reporter...";
-            enabled: false
-        }
-        Action {
-            id: help;
-            text: menuOption.help
-            onTriggered: Application.showHelp()
-        }
-        Action {
-            id: aboutApp;
-            text: menuOption.aboutApp
-        }
-        Action {
-            id: quit;
-            text: menuOption.quit
-        }
-
-        ExclusiveGroup { id: renderResolutionGroup }
-        Action {
-            id: renderResolutionOne;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionOne;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderResolutionTwoThird;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionTwoThird;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionHalf;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionHalf;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionThird;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionThird;
-            checkable: true
-        }
-        Action {
-            id: renderResolutionQuarter;
-            exclusiveGroup: renderResolutionGroup;
-            text: menuOption.renderResolutionQuarter;
-            checkable: true
-        }
-
-        ExclusiveGroup { id: ambientLightGroup }
-        Action {
-            id: renderAmbientLightGlobal;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLightGlobal;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight0;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight0;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight1;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight1;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight2;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight2;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight3;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight3;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight4;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight4;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight5;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight5;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight6;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight6;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight7;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight7;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight8;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight8;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: renderAmbientLight9;
-            exclusiveGroup: ambientLightGroup;
-            text: menuOption.renderAmbientLight9;
-            checkable: true;
-            checked: true
-        }
-        Action {
-            id: preferences
-            shortcut: StandardKey.Preferences
-            text: menuOption.preferences
-            onTriggered: dialogsManager.editPreferences()
-        }
-
-    }
-
-    Menu {
-        title: "File"
-        MenuItem {
-            action: login
-        }
-        MenuItem {
-            action: update
-        }
-        MenuItem {
-            action: help
-        }
-        MenuItem {
-            action: crashReporter
-        }
-        MenuItem {
-            action: aboutApp
-        }
-        MenuItem {
-            action: quit
-        }
-    }
-
-    Menu {
-        title: "Edit"
-        MenuItem {
-            text: "Undo" }
-        MenuItem {
-            text: "Redo" }
-        MenuItem {
-            text: menuOption.runningScripts
-        }
-        MenuItem {
-            text: menuOption.loadScript
-        }
-        MenuItem {
-            text: menuOption.loadScriptURL
-        }
-        MenuItem {
-            text: menuOption.stopAllScripts
-        }
-        MenuItem {
-            text: menuOption.reloadAllScripts
-        }
-        MenuItem {
-            text: menuOption.scriptEditor
-        }
-        MenuItem {
-            text: menuOption.console_
-        }
-        MenuItem {
-            text: menuOption.reloadContent
-        }
-        MenuItem {
-            text: menuOption.packageModel
-        }
-    }
-
-    Menu {
-        title: "Audio"
-        MenuItem {
-            text: menuOption.muteAudio;
-            checkable: true
-        }
-        MenuItem {
-            text: menuOption.audioTools;
-            checkable: true
-        }
-    }
-    Menu {
-        title: "Avatar"
-        // Avatar > Attachments...
-        MenuItem {
-            text: menuOption.attachments
-        }
-        Menu {
-            title: "Size"
-            // Avatar > Size > Increase
-            MenuItem {
-                text: menuOption.increaseAvatarSize
-            }
-            // Avatar > Size > Decrease
-            MenuItem {
-                text: menuOption.decreaseAvatarSize
-            }
-            // Avatar > Size > Reset
-            MenuItem {
-                text: menuOption.resetAvatarSize
-            }
-        }
-        // Avatar > Reset Sensors
-        MenuItem {
-            text: menuOption.resetSensors
-        }
-    }
-    Menu {
-        title: "Display"
-    }
-    Menu {
-        title: "View"
-        ExclusiveGroup {
-            id: cameraModeGroup
-        }
-
-        MenuItem {
-            text: menuOption.firstPerson;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.thirdPerson;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.fullscreenMirror;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.independentMode;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuItem {
-            text: menuOption.cameraEntityMode;
-            checkable: true;
-            exclusiveGroup: cameraModeGroup
-        }
-        MenuSeparator{}
-        MenuItem {
-            text: menuOption.miniMirror;
-            checkable: true
-        }
-    }
-    Menu {
-        title: "Navigate"
-        MenuItem {
-            text: "Home" }
-        MenuItem {
-            text: menuOption.addressBar
-        }
-        MenuItem {
-            text: "Directory" }
-        MenuItem {
-            text: menuOption.copyAddress
-        }
-        MenuItem {
-            text: menuOption.copyPath
-        }
-    }
-    Menu {
-        title: "Settings"
-        MenuItem {
-            text: "Advanced Menus" }
-        MenuItem {
-            text: "Developer Menus" }
-        MenuItem {
-            text: menuOption.preferences
-        }
-        MenuItem {
-            text: "Avatar..." }
-        MenuItem {
-            text: "Audio..." }
-        MenuItem {
-            text: "LOD..." }
-        MenuItem {
-            text: menuOption.inputMenu
-        }
-    }
-    Menu {
-        title: "Developer"
-        Menu {
-            title: "Render"
-            MenuItem {
-                text: menuOption.atmosphere;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.worldAxes;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.debugAmbientOcclusion;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.antialiasing;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.stars;
-                checkable: true
-            }
-            Menu {
-                title: menuOption.renderAmbientLight
-                MenuItem {
-                    action: renderAmbientLightGlobal; }
-                MenuItem {
-                    action: renderAmbientLight0; }
-                MenuItem {
-                    action: renderAmbientLight1; }
-                MenuItem {
-                    action: renderAmbientLight2; }
-                MenuItem {
-                    action: renderAmbientLight3; }
-                MenuItem {
-                    action: renderAmbientLight4; }
-                MenuItem {
-                    action: renderAmbientLight5; }
-                MenuItem {
-                    action: renderAmbientLight6; }
-                MenuItem {
-                    action: renderAmbientLight7; }
-                MenuItem {
-                    action: renderAmbientLight8; }
-                MenuItem {
-                    action: renderAmbientLight9; }
-            }
-            MenuItem {
-                text: menuOption.throttleFPSIfNotFocus;
-                checkable: true
-            }
-            Menu {
-                title: menuOption.renderResolution
-                MenuItem {
-                    action: renderResolutionOne
-                }
-                MenuItem {
-                    action: renderResolutionTwoThird
-                }
-                MenuItem {
-                    action: renderResolutionHalf
-                }
-                MenuItem {
-                    action: renderResolutionThird
-                }
-                MenuItem {
-                    action: renderResolutionQuarter
-                }
-            }
-            MenuItem {
-                text: menuOption.lodTools
-            }
-        }
-        Menu {
-            title: "Assets"
-            MenuItem {
-                text: menuOption.uploadAsset
-            }
-            MenuItem {
-                text: menuOption.assetMigration
-            }
-        }
-        Menu {
-            title: "Avatar"
-            Menu {
-                title: "Face Tracking"
-                MenuItem {
-                    text: menuOption.noFaceTracking;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.faceshift;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.useCamera;
-                    checkable: true
-                }
-                MenuSeparator{}
-                MenuItem {
-                    text: menuOption.binaryEyelidControl;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.coupleEyelids;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.useAudioForMouth;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.velocityFilter;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.calibrateCamera
-                }
-                MenuSeparator{}
-                MenuItem {
-                    text: menuOption.muteFaceTracking;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.autoMuteAudio;
-                    checkable: true
-                }
-            }
-            Menu {
-                title: "Eye Tracking"
-                MenuItem {
-                    text: menuOption.sMIEyeTracking;
-                    checkable: true
-                }
-                Menu {
-                    title: "Calibrate"
-                    MenuItem {
-                        text: menuOption.onePointCalibration
-                    }
-                    MenuItem {
-                        text: menuOption.threePointCalibration
-                    }
-                    MenuItem {
-                        text: menuOption.fivePointCalibration
-                    }
-                }
-                MenuItem {
-                    text: menuOption.simulateEyeTracking;
-                    checkable: true
-                }
-            }
-            MenuItem {
-                text: menuOption.avatarReceiveStats;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderBoundingCollisionShapes;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderLookAtVectors;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderLookAtTargets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.renderFocusIndicator;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.showWhosLookingAtMe;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.fixGaze;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawDefaultPose;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawAnimPose;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.animDebugDrawPosition;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.meshVisible;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.disableEyelidAdjustment;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.turnWithHead;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.keyboardMotorControl;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.scriptedMotorControl;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.enableCharacterController;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Hands"
-            MenuItem {
-                text: menuOption.displayHandTargets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.lowVelocityFilter;
-                checkable: true
-            }
-            Menu {
-                title: "Leap Motion"
-                MenuItem {
-                    text: menuOption.leapMotionOnHMD;
-                    checkable: true
-                }
-            }
-        }
-        Menu {
-            title: "Entities"
-            MenuItem {
-                text: menuOption.octreeStats
-            }
-            MenuItem {
-                text: menuOption.showRealtimeEntityStats;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Network"
-            MenuItem {
-                text: menuOption.reloadContent
-            }
-            MenuItem {
-                text: menuOption.disableNackPackets;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.disableActivityLogger;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.cachesSize
-            }
-            MenuItem {
-                text: menuOption.diskCacheEditor
-            }
-            MenuItem {
-                text: menuOption.showDSConnectTable
-            }
-            MenuItem {
-                text: menuOption.bandwidthDetails
-            }
-        }
-        Menu {
-            title: "Timing"
-            Menu {
-                title: "Performance Timer"
-                MenuItem {
-                    text: menuOption.displayDebugTimingDetails;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.onlyDisplayTopTen;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandUpdateTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandMyAvatarTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandMyAvatarSimulateTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandOtherAvatarTiming;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.expandPaintGLTiming;
-                    checkable: true
-                }
-            }
-            MenuItem {
-                text: menuOption.frameTimer;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.runTimingTests
-            }
-            MenuItem {
-                text: menuOption.pipelineWarnings;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.logExtraTimings;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.suppressShortTimings;
-                checkable: true
-            }
-        }
-        Menu {
-            title: "Audio"
-            MenuItem {
-                text: menuOption.audioNoiseReduction;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.echoServerAudio;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.echoLocalAudio;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.muteEnvironment
-            }
-            Menu {
-                title: "Audio"
-                MenuItem {
-                    text: menuOption.audioScope;
-                    checkable: true
-                }
-                MenuItem {
-                    text: menuOption.audioScopePause;
-                    checkable: true
-                }
-                Menu {
-                    title: "Display Frames"
-                    ExclusiveGroup {
-                        id: audioScopeFramesGroup
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeFiveFrames;
-                        checkable: true
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeTwentyFrames;
-                        checkable: true
-                    }
-                    MenuItem {
-                        exclusiveGroup: audioScopeFramesGroup;
-                        text: menuOption.audioScopeFiftyFrames;
-                        checkable: true
-                    }
-                }
-                MenuItem {
-                    text: menuOption.audioNetworkStats
-                }
-            }
-        }
-        Menu {
-            title: "Physics"
-            MenuItem {
-                text: menuOption.physicsShowOwned;
-                checkable: true
-            }
-            MenuItem {
-                text: menuOption.physicsShowHulls;
-                checkable: true
-            }
-        }
-        MenuItem {
-            text: menuOption.displayCrashOptions;
-            checkable: true
-        }
-        MenuItem {
-            text: menuOption.crashInterface
-        }
-        MenuItem {
-            text: menuOption.log
-        }
-        MenuItem {
-            text: menuOption.stats;
-            checkable: true
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/Stubs.qml b/tests-manual/ui/qml/Stubs.qml
deleted file mode 100644
index 8c1465d54c..0000000000
--- a/tests-manual/ui/qml/Stubs.qml
+++ /dev/null
@@ -1,346 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-
-// Stubs for the global service objects set by Interface.cpp when creating the UI
-// This is useful for testing inside Qt creator where these services don't actually exist.
-Item {
-
-    Item {
-        objectName: "offscreenFlags"
-        property bool navigationFocused: false
-    }
-
-    Item {
-        objectName: "urlHandler"
-        function fixupUrl(url) { return url; }
-        function canHandleUrl(url) { return false; }
-        function handleUrl(url) { return true; }
-    }
-
-    Item {
-        objectName: "Account"
-        function isLoggedIn() { return true; }
-        function getUsername() { return "Jherico"; }
-    }
-
-    Item {
-        objectName: "GL"
-        property string vendor: ""
-    }
-
-    Item {
-        objectName: "ApplicationCompositor"
-        property bool reticleOverDesktop: true
-    }
-
-    Item {
-        objectName: "Controller"
-        function getRecommendedOverlayRect() {
-            return Qt.rect(0, 0, 1920, 1080);
-        }
-    }
-
-    Item {
-        objectName: "Preferences"
-        // List of categories obtained by logging categories as they are added in Interface in Preferences::addPreference().
-        property var categories: [
-            "Avatar Basics", "Snapshots", "Scripts", "Privacy", "Level of Detail Tuning", "Avatar Tuning", "Avatar Camera",
-            "Audio", "Octree", "HMD", "Sixense Controllers", "Graphics"
-        ]
-    }
-
-    Item {
-        objectName: "ScriptDiscoveryService"
-        //property var scriptsModelFilter: scriptsModel
-        signal scriptCountChanged()
-        property var _runningScripts:[
-            { name: "wireFrameTest.js", url: "foo/wireframetest.js", path: "foo/wireframetest.js", local: true },
-            { name: "edit.js", url: "foo/edit.js", path: "foo/edit.js", local: false },
-            { name: "listAllScripts.js", url: "foo/listAllScripts.js", path: "foo/listAllScripts.js", local: false },
-            { name: "users.js", url: "foo/users.js", path: "foo/users.js", local: false },
-        ]
-
-        function getRunning() {
-            return _runningScripts;
-        }
-    }
-
-    Item {
-        objectName: "HMD"
-        property bool active: false
-    }
-
-    Item {
-        id: menuHelper
-        objectName: "MenuHelper"
-
-        Component {
-            id: modelMaker
-            ListModel { }
-        }
-
-        function toModel(menu, parent) {
-            if (!parent) { parent = menuHelper }
-            var result = modelMaker.createObject(parent);
-            if (menu.type !== MenuItemType.Menu) {
-                console.warn("Not a menu: " + menu);
-                return result;
-            }
-
-            var items = menu.items;
-            for (var i = 0; i < items.length; ++i) {
-                var item = items[i];
-                switch (item.type) {
-                case 2:
-                    result.append({"name": item.title, "item": item})
-                    break;
-                case 1:
-                    result.append({"name": item.text, "item": item})
-                    break;
-                case 0:
-                    result.append({"name": "", "item": item})
-                    break;
-                }
-            }
-            return result;
-        }
-
-    }
-
-    Item {
-        objectName: "Desktop"
-
-        property string _OFFSCREEN_ROOT_OBJECT_NAME: "desktopRoot";
-        property string _OFFSCREEN_DIALOG_OBJECT_NAME: "topLevelWindow";
-
-
-        function findChild(item, name) {
-            for (var i = 0; i < item.children.length; ++i) {
-                if (item.children[i].objectName === name) {
-                    return item.children[i];
-                }
-            }
-            return null;
-        }
-
-        function findParent(item, name) {
-            while (item) {
-                if (item.objectName === name) {
-                    return item;
-                }
-                item = item.parent;
-            }
-            return null;
-        }
-
-        function findDialog(item) {
-            item = findParent(item, _OFFSCREEN_DIALOG_OBJECT_NAME);
-            return item;
-        }
-
-        function closeDialog(item) {
-            item = findDialog(item);
-            if (item) {
-                item.visible = false
-            } else {
-                console.warn("Could not find top level dialog")
-            }
-        }
-
-        function getDesktop(item) {
-            while (item) {
-                if (item.desktopRoot) {
-                    break;
-                }
-                item = item.parent;
-            }
-            return item
-        }
-
-        function raise(item) {
-            var desktop = getDesktop(item);
-            if (desktop) {
-                desktop.raise(item);
-            }
-        }
-    }
-
-    Menu {
-        id: root
-        objectName: "rootMenu"
-
-        Menu {
-            title: "Audio"
-        }
-
-        Menu {
-            title: "Avatar"
-        }
-
-        Menu {
-            title: "Display"
-            ExclusiveGroup { id: displayMode }
-            Menu {
-                title: "More Stuff"
-
-                Menu { title: "Empty" }
-
-                MenuItem {
-                    text: "Do Nothing"
-                    onTriggered: console.log("Nothing")
-                }
-            }
-            MenuItem {
-                text: "Oculus"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "OpenVR"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "OSVR"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "2D Screen"
-                exclusiveGroup: displayMode
-                checkable: true
-                checked: true
-            }
-            MenuItem {
-                text: "3D Screen (Active)"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-            MenuItem {
-                text: "3D Screen (Passive)"
-                exclusiveGroup: displayMode
-                checkable: true
-            }
-        }
-
-        Menu {
-            title: "View"
-            Menu {
-                title: "Camera Mode"
-                ExclusiveGroup { id: cameraMode }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "First Person";
-                    onTriggered: console.log(text + " checked " + checked)
-                    checkable: true
-                    checked: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Third Person";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Independent Mode";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Entity Mode";
-                    onTriggered: console.log(text)
-                    enabled: false
-                    checkable: true
-                }
-                MenuItem {
-                    exclusiveGroup: cameraMode
-                    text: "Fullscreen Mirror";
-                    onTriggered: console.log(text)
-                    checkable: true
-                }
-            }
-        }
-
-        Menu {
-            title: "Edit"
-
-            MenuItem {
-                text: "Undo"
-                shortcut: "Ctrl+Z"
-                enabled: false
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Redo"
-                shortcut: "Ctrl+Shift+Z"
-                enabled: false
-                onTriggered: console.log(text)
-            }
-
-            MenuSeparator { }
-
-            MenuItem {
-                text: "Cut"
-                shortcut: "Ctrl+X"
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Copy"
-                shortcut: "Ctrl+C"
-                onTriggered: console.log(text)
-            }
-
-            MenuItem {
-                text: "Paste"
-                shortcut: "Ctrl+V"
-                visible: false
-                onTriggered: console.log("Paste")
-            }
-        }
-
-        Menu {
-            title: "Navigate"
-        }
-
-        Menu {
-            title: "Market"
-        }
-
-        Menu {
-            title: "Settings"
-        }
-
-        Menu {
-            title: "Developer"
-        }
-
-        Menu {
-            title: "Quit"
-        }
-
-        Menu {
-            title: "File"
-
-            Action  {
-                id: login
-                text: "Login"
-            }
-
-            Action  {
-                id: quit
-                text: "Quit"
-                shortcut: "Ctrl+Q"
-                onTriggered: Qt.quit();
-            }
-
-            MenuItem { action: quit }
-            MenuItem { action: login }
-        }
-    }
-
-}
-
diff --git a/tests-manual/ui/qml/TestControllers.qml b/tests-manual/ui/qml/TestControllers.qml
deleted file mode 100644
index e9a7fb49e5..0000000000
--- a/tests-manual/ui/qml/TestControllers.qml
+++ /dev/null
@@ -1,160 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Layouts 1.0
-import QtQuick.Dialogs 1.0
-
-import "controller"
-import "controls" as HifiControls
-import "styles"
-
-HifiControls.VrDialog {
-    id: root
-    HifiConstants { id: hifi }
-    title: "Controller Test"
-    resizable: true
-    contentImplicitWidth: clientArea.implicitWidth
-    contentImplicitHeight: clientArea.implicitHeight
-    backgroundColor: "beige"
-
-    property var actions: Controller.Actions
-    property var standard: Controller.Standard
-    property var hydra: null
-    property var testMapping: null
-    property bool testMappingEnabled: false
-    property var xbox: null
-
-    function buildMapping() {
-        testMapping = Controller.newMapping();
-        testMapping.fromQml(standard.RY).invert().toQml(actions.Pitch);
-        testMapping.fromQml(function(){
-            return Math.sin(Date.now() / 250); 
-        }).toQml(actions.Yaw);
-        //testMapping.makeAxis(standard.LB, standard.RB).to(actions.Yaw);
-        // Step yaw takes a number of degrees
-        testMapping.fromQml(standard.LB).pulse(0.10).invert().scale(40.0).toQml(actions.StepYaw);
-        testMapping.fromQml(standard.RB).pulse(0.10).scale(15.0).toQml(actions.StepYaw);
-        testMapping.fromQml(standard.RX).scale(15.0).toQml(actions.StepYaw);
-    }
-
-    function toggleMapping() {
-        testMapping.enable(!testMappingEnabled);
-        testMappingEnabled = !testMappingEnabled;
-    }
-
-    Component.onCompleted: {
-        var xboxRegex = /^GamePad/;
-        var hydraRegex = /^Hydra/;
-        for (var prop in Controller.Hardware) {
-            if(xboxRegex.test(prop)) {
-                root.xbox = Controller.Hardware[prop]
-                print("found xbox")
-                continue
-            }
-            if (hydraRegex.test(prop)) {
-                root.hydra = Controller.Hardware[prop]
-                print("found hydra")
-                continue
-            }
-        }
-    }
-
-    Column {
-        id: clientArea
-        spacing: 12
-        x: root.clientX
-        y: root.clientY
-
-        Row {
-            spacing: 8
-            
-            Button {
-                text: !root.testMapping ? "Build Mapping" : (root.testMappingEnabled ? "Disable Mapping" : "Enable Mapping")
-                onClicked: {
-
-                    if (!root.testMapping) {
-                        root.buildMapping()
-                    } else {
-                        root.toggleMapping();
-                    }
-                }
-            }
-        }
-
-        Row {
-            Standard { device: root.standard; label: "Standard"; width: 180 }
-        }
-        
-        Row {
-            spacing: 8
-            Xbox { device: root.xbox; label: "XBox"; width: 180 }
-            Hydra { device: root.hydra; width: 180 }
-        }
-        
-        Row {
-            spacing: 4
-            ScrollingGraph {
-                controlId: Controller.Actions.Yaw
-                label: "Yaw"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.YawLeft
-                label: "Yaw Left"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.YawRight
-                label: "Yaw Right"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.StepYaw
-                label: "StepYaw"
-                min: -20.0
-                max: 20.0
-                size: 64
-            }
-        }
-
-        Row {
-            ScrollingGraph {
-                controlId: Controller.Actions.TranslateZ
-                label: "TranslateZ"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.Forward
-                label: "Forward"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-            ScrollingGraph {
-                controlId: Controller.Actions.Backward
-                label: "Backward"
-                min: -2.0
-                max: 2.0
-                size: 64
-            }
-
-        }
-    }
-} // dialog
-
-
-
-
-
diff --git a/tests-manual/ui/qml/TestDialog.qml b/tests-manual/ui/qml/TestDialog.qml
deleted file mode 100644
index e6675b7282..0000000000
--- a/tests-manual/ui/qml/TestDialog.qml
+++ /dev/null
@@ -1,94 +0,0 @@
-import QtQuick 2.3
-import QtQuick.Controls 1.2
-import QtQuick.Controls.Styles 1.3
-import "controls"
-
-VrDialog {
-    title: "Test Dialog"
-    id: testDialog
-    objectName: "TestDialog"
-    width: 512
-    height: 512
-    animationDuration: 200
-
-    onEnabledChanged: {
-        if (enabled) {
-            edit.forceActiveFocus();
-        }
-    }
-    
-    Item {
-        id: clientArea
-        // The client area
-        anchors.fill: parent
-        anchors.margins: parent.margins
-        anchors.topMargin: parent.topMargin
-    
-        Rectangle {
-            property int d: 100
-            id: square
-            objectName: "testRect"
-            width: d
-            height: d
-            anchors.centerIn: parent
-            color: "red"
-            NumberAnimation on rotation { from: 0; to: 360; duration: 2000; loops: Animation.Infinite; }
-        }
-    
-    
-        TextEdit {
-            id: edit
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            clip: true
-            text: "test edit"
-            anchors.top: parent.top
-            anchors.topMargin: 12
-        }
-
-        Button {
-            x: 128
-            y: 192
-            text: "Test"
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 12
-            anchors.right: parent.right
-            anchors.rightMargin: 12
-            onClicked: {
-                console.log("Click");
-                
-                if (square.visible) {
-                    square.visible = false
-                } else {
-                    square.visible = true
-                }
-            }
-        }
-    
-        Button {
-            id: customButton2
-            y: 192
-            text: "Move"
-            anchors.left: parent.left
-            anchors.leftMargin: 12
-            anchors.bottom: parent.bottom
-            anchors.bottomMargin: 12
-            onClicked: {
-                onClicked: testDialog.x == 0 ? testDialog.x = 200 : testDialog.x = 0
-            }
-        }
-        
-        Keys.onPressed: {
-            console.log("Key " + event.key);
-            switch (event.key) {
-            case Qt.Key_Q:
-                if (Qt.ControlModifier == event.modifiers) {
-                    event.accepted = true;
-                    break;
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/TestMenu.qml b/tests-manual/ui/qml/TestMenu.qml
deleted file mode 100644
index fe8a26e234..0000000000
--- a/tests-manual/ui/qml/TestMenu.qml
+++ /dev/null
@@ -1,10 +0,0 @@
-import QtQuick 2.4
-import QtQuick.Controls 1.3
-import Hifi 1.0
-
-// Currently for testing a pure QML replacement menu
-Item {
-    Menu {
-        objectName: "rootMenu";
-    } 
-}
diff --git a/tests-manual/ui/qml/TestRoot.qml b/tests-manual/ui/qml/TestRoot.qml
deleted file mode 100644
index bd38c696bf..0000000000
--- a/tests-manual/ui/qml/TestRoot.qml
+++ /dev/null
@@ -1,43 +0,0 @@
-import Hifi 1.0
-import QtQuick 2.3
-import QtQuick.Controls 1.3
-// Import local folder last so that our own control customizations override 
-// the built in ones
-import "controls"
-
-Root {
-    id: root
-    anchors.fill: parent
-    onParentChanged: {
-        forceActiveFocus();
-    }
-    Button {
-        id: messageBox
-        anchors.right: createDialog.left
-        anchors.rightMargin: 24
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 24
-        text: "Message"
-        onClicked: {
-            console.log("Foo")
-            root.information("a")
-            console.log("Bar")
-        }
-    }
-    Button {
-        id: createDialog
-        anchors.right: parent.right
-        anchors.rightMargin: 24
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: 24
-        text: "Create"
-        onClicked: {
-            root.loadChild("MenuTest.qml");
-        }
-    }
-
-    Keys.onPressed: {
-        console.log("Key press root")
-    }
-}
-
diff --git a/tests-manual/ui/qml/controlDemo/ButtonPage.qml b/tests-manual/ui/qml/controlDemo/ButtonPage.qml
deleted file mode 100644
index 0ed7e2d6ad..0000000000
--- a/tests-manual/ui/qml/controlDemo/ButtonPage.qml
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, grid.implicitWidth + 2 * grid.rowSpacing)
-        height: Math.max(page.viewport.height, grid.implicitHeight + 2 * grid.columnSpacing)
-
-        GridLayout {
-            id: grid
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.leftMargin: grid.rowSpacing
-            anchors.rightMargin: grid.rowSpacing
-            anchors.topMargin: grid.columnSpacing
-
-            columns: page.width < page.height ? 1 : 2
-
-            GroupBox {
-                title: "Button"
-                Layout.fillWidth: true
-                Layout.columnSpan: grid.columns
-                RowLayout {
-                    anchors.fill: parent
-                    Button { text: "OK"; isDefault: true }
-                    Button { text: "Cancel" }
-                    Item { Layout.fillWidth: true }
-                    Button {
-                        text: "Attach"
-                        menu: Menu {
-                            MenuItem { text: "Image" }
-                            MenuItem { text: "Document" }
-                        }
-                    }
-                }
-            }
-
-            GroupBox {
-                title: "CheckBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    CheckBox { text: "E-mail"; checked: true }
-                    CheckBox { text: "Calendar"; checked: true }
-                    CheckBox { text: "Contacts" }
-                }
-            }
-
-            GroupBox {
-                title: "RadioButton"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ExclusiveGroup { id: radioGroup }
-                    RadioButton { text: "Portrait"; exclusiveGroup: radioGroup }
-                    RadioButton { text: "Landscape"; exclusiveGroup: radioGroup }
-                    RadioButton { text: "Automatic"; exclusiveGroup: radioGroup; checked: true }
-                }
-            }
-
-            GroupBox {
-                title: "Switch"
-                Layout.fillWidth: true
-                Layout.columnSpan: grid.columns
-                ColumnLayout {
-                    anchors.fill: parent
-                    RowLayout {
-                        Label { text: "Wi-Fi"; Layout.fillWidth: true }
-                        Switch { checked: true }
-                    }
-                    RowLayout {
-                        Label { text: "Bluetooth"; Layout.fillWidth: true }
-                        Switch { checked: false }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/InputPage.qml b/tests-manual/ui/qml/controlDemo/InputPage.qml
deleted file mode 100644
index cb1878d023..0000000000
--- a/tests-manual/ui/qml/controlDemo/InputPage.qml
+++ /dev/null
@@ -1,114 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
-        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
-
-        ColumnLayout {
-            id: column
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: column.spacing
-
-            GroupBox {
-                title: "TextField"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    TextField { placeholderText: "..."; Layout.fillWidth: true; z: 1 }
-                    TextField { placeholderText: "Password"; echoMode: TextInput.Password; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "ComboBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ComboBox {
-                        model: Qt.fontFamilies()
-                        Layout.fillWidth: true
-                    }
-                    ComboBox {
-                        editable: true
-                        model: ListModel {
-                            id: listModel
-                            ListElement { text: "Apple" }
-                            ListElement { text: "Banana" }
-                            ListElement { text: "Coconut" }
-                            ListElement { text: "Orange" }
-                        }
-                        onAccepted: {
-                            if (find(currentText) === -1) {
-                                listModel.append({text: editText})
-                                currentIndex = find(editText)
-                            }
-                        }
-                        Layout.fillWidth: true
-                    }
-                }
-            }
-
-            GroupBox {
-                title: "SpinBox"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    SpinBox { value: 99; Layout.fillWidth: true; z: 1 }
-                    SpinBox { decimals: 2; Layout.fillWidth: true }
-                }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/ProgressPage.qml b/tests-manual/ui/qml/controlDemo/ProgressPage.qml
deleted file mode 100644
index a1fa596f79..0000000000
--- a/tests-manual/ui/qml/controlDemo/ProgressPage.qml
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Controls 1.2
-
-ScrollView {
-    id: page
-
-    horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-
-    Item {
-        id: content
-
-        width: Math.max(page.viewport.width, column.implicitWidth + 2 * column.spacing)
-        height: Math.max(page.viewport.height, column.implicitHeight + 2 * column.spacing)
-
-        ColumnLayout {
-            id: column
-
-            anchors.top: parent.top
-            anchors.left: parent.left
-            anchors.right: parent.right
-            anchors.margins: column.spacing
-
-            GroupBox {
-                title: "ProgressBar"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    ProgressBar { indeterminate: true; Layout.fillWidth: true }
-                    ProgressBar { value: slider.value; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "Slider"
-                Layout.fillWidth: true
-                ColumnLayout {
-                    anchors.fill: parent
-                    Slider { id: slider; value: 0.5; Layout.fillWidth: true }
-                }
-            }
-
-            GroupBox {
-                title: "BusyIndicator"
-                Layout.fillWidth: true
-                BusyIndicator { running: true }
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/controlDemo/main.qml b/tests-manual/ui/qml/controlDemo/main.qml
deleted file mode 100644
index 168b9fb291..0000000000
--- a/tests-manual/ui/qml/controlDemo/main.qml
+++ /dev/null
@@ -1,161 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the Qt Quick Controls module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
-**     from this software without specific prior written permission.
-**
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.2
-import QtQuick.Layouts 1.1
-import QtQuick.Dialogs 1.1
-import QtQuick.Controls 1.2
-import "qml/UI.js" as UI
-import "qml"
-//import "/Users/bdavis/Git/hifi/interface/resources/qml"
-
-Item {
-    anchors.fill: parent
-    visible: true
-    //title: "Qt Quick Controls Gallery"
-
-    MessageDialog {
-        id: aboutDialog
-        icon: StandardIcon.Information
-        title: "About"
-        text: "Qt Quick Controls Gallery"
-        informativeText: "This example demonstrates most of the available Qt Quick Controls."
-    }
-
-    Action {
-        id: copyAction
-        text: "&Copy"
-        shortcut: StandardKey.Copy
-        iconName: "edit-copy"
-        enabled: (!!activeFocusItem && !!activeFocusItem["copy"])
-        onTriggered: activeFocusItem.copy()
-    }
-
-    Action {
-        id: cutAction
-        text: "Cu&t"
-        shortcut: StandardKey.Cut
-        iconName: "edit-cut"
-        enabled: (!!activeFocusItem && !!activeFocusItem["cut"])
-        onTriggered: activeFocusItem.cut()
-    }
-
-    Action {
-        id: pasteAction
-        text: "&Paste"
-        shortcut: StandardKey.Paste
-        iconName: "edit-paste"
-        enabled: (!!activeFocusItem && !!activeFocusItem["paste"])
-        onTriggered: activeFocusItem.paste()
-    }
-
-//    toolBar: ToolBar {
-//        RowLayout {
-//            anchors.fill: parent
-//            anchors.margins: spacing
-//            Label {
-//                text: UI.label
-//            }
-//            Item { Layout.fillWidth: true }
-//            CheckBox {
-//                id: enabler
-//                text: "Enabled"
-//                checked: true
-//            }
-//        }
-//    }
-
-//    menuBar: MenuBar {
-//        Menu {
-//            title: "&File"
-//            MenuItem {
-//                text: "E&xit"
-//                shortcut: StandardKey.Quit
-//                onTriggered: Qt.quit()
-//            }
-//        }
-//        Menu {
-//            title: "&Edit"
-//            visible: tabView.currentIndex == 2
-//            MenuItem { action: cutAction }
-//            MenuItem { action: copyAction }
-//            MenuItem { action: pasteAction }
-//        }
-//        Menu {
-//            title: "&Help"
-//            MenuItem {
-//                text: "About..."
-//                onTriggered: aboutDialog.open()
-//            }
-//        }
-//    }
-
-    TabView {
-        id: tabView
-
-        anchors.fill: parent
-        anchors.margins: UI.margin
-        tabPosition: UI.tabPosition
-
-        Layout.minimumWidth: 360
-        Layout.minimumHeight: 360
-        Layout.preferredWidth: 480
-        Layout.preferredHeight: 640
-
-        Tab {
-            title: "Buttons"
-            ButtonPage {
-                enabled: enabler.checked
-            }
-        }
-        Tab {
-            title: "Progress"
-            ProgressPage {
-                enabled: enabler.checked
-            }
-        }
-        Tab {
-            title: "Input"
-            InputPage {
-                enabled: enabler.checked
-            }
-        }
-    }
-}
diff --git a/tests-manual/ui/qml/main.qml b/tests-manual/ui/qml/main.qml
deleted file mode 100644
index 607bd624a1..0000000000
--- a/tests-manual/ui/qml/main.qml
+++ /dev/null
@@ -1,461 +0,0 @@
-import QtQuick 2.5
-import QtQuick.Controls 1.4
-import QtQuick.Dialogs 1.2 as OriginalDialogs
-import Qt.labs.settings 1.0
-
-import "../../../interface/resources/qml"
-//import "../../../interface/resources/qml/windows"
-import "../../../interface/resources/qml/windows"
-import "../../../interface/resources/qml/dialogs"
-import "../../../interface/resources/qml/hifi"
-import "../../../interface/resources/qml/hifi/dialogs"
-import "../../../interface/resources/qml/styles-uit"
-
-ApplicationWindow {
-    id: appWindow
-    objectName: "MainWindow"
-    visible: true
-    width: 1280
-    height: 800
-    title: qsTr("Scratch App")
-    toolBar: Row {
-        id: testButtons
-        anchors { margins: 8; left: parent.left; top: parent.top }
-        spacing: 8
-        property int count: 0
-
-        property var tabs: [];
-        property var urls: [];
-        property var toolbar;
-        property var lastButton;
-
-        Button {
-            text: HMD.active ? "Disable HMD" : "Enable HMD"
-            onClicked: HMD.active = !HMD.active
-        }
-
-        Button {
-            text: desktop.hmdHandMouseActive ? "Disable HMD HandMouse" : "Enable HMD HandMouse"
-            onClicked: desktop.hmdHandMouseActive = !desktop.hmdHandMouseActive
-        }
-
-        // Window visibility
-        Button {
-            text: "toggle desktop"
-            onClicked: desktop.togglePinned()
-        }
-
-        Button {
-            text: "Create Toolbar"
-            onClicked: testButtons.toolbar = desktop.getToolbar("com.highfidelity.interface.toolbar.system");
-        }
-
-        Button {
-            text: "Toggle Toolbar Direction"
-            onClicked: testButtons.toolbar.horizontal = !testButtons.toolbar.horizontal
-        }
-
-        Button {
-            readonly property var icons: [
-                "edit-01.svg",
-                "model-01.svg",
-                "cube-01.svg",
-                "sphere-01.svg",
-                "light-01.svg",
-                "text-01.svg",
-                "web-01.svg",
-                "zone-01.svg",
-                "particle-01.svg",
-            ]
-            property int iconIndex: 0
-            readonly property string toolIconUrl: "../../../../../scripts/system/assets/images/tools/"
-            text: "Create Button"
-            onClicked: {
-                var name = icons[iconIndex];
-                var url = toolIconUrl + name;
-                iconIndex = (iconIndex + 1) % icons.length;
-                var button = testButtons.lastButton = testButtons.toolbar.addButton({
-                    imageURL: url,
-                    objectName: name,
-                    subImage: {
-                        y: 50,
-                    },
-                    alpha: 0.9
-                });
-
-                button.clicked.connect(function(){
-                    console.log("Clicked on button " + button.imageURL + " alpha " + button.alpha)
-                });
-            }
-        }
-
-        Button {
-            text: "Toggle Button Visible"
-            onClicked: testButtons.lastButton.visible = !testButtons.lastButton.visible
-        }
-
-        // Error alerts
-        /*
-        Button {
-            // Message without title.
-            text: "Show Error"
-            onClicked: {
-                var messageBox = desktop.messageBox({
-                                                        text: "Diagnostic cycle will be complete in 30 seconds",
-                                                        icon: hifi.icons.critical,
-                                                    });
-                messageBox.selected.connect(function(button) {
-                    console.log("You clicked " + button)
-                })
-            }
-        }
-        Button {
-            // detailedText is not currently used anywhere in Interface but it is easier to leave in and style good enough.
-            text: "Show Long Error"
-            onClicked: {
-                desktop.messageBox({
-                                       informativeText: "Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds  Diagnostic cycle will be complete in 30 seconds ",
-                                       text: "Baloney",
-                                       icon: hifi.icons.warning,
-                                       detailedText: "sakjd;laskj dksa;dl jka;lsd j;lkjas ;dlkaj s;dlakjd ;alkjda; slkjda; lkjda;lksjd ;alksjd; alksjd ;alksjd; alksjd; alksdjas;ldkjas;lkdja ;kj ;lkasjd; lkj as;dlka jsd;lka jsd;laksjd a"
-                                   });
-            }
-        }
-        */
-
-        // query
-        /*
-        // There is no such desktop.queryBox() function; may need to update test to cover QueryDialog.qml?
-        Button {
-            text: "Show Query"
-            onClicked: {
-                var queryBox = desktop.queryBox({
-                                                      text: "Have you stopped beating your wife?",
-                                                      placeholderText: "Are you sure?",
-                                                     // icon: hifi.icons.critical,
-                                                  });
-                queryBox.selected.connect(function(result) {
-                    console.log("User responded with " + result);
-                });
-
-                queryBox.canceled.connect(function() {
-                    console.log("User cancelled query box ");
-                })
-            }
-        }
-        */
-
-        // Browser
-        /*
-        Button {
-            text: "Open Browser"
-            onClicked: builder.createObject(desktop);
-            property var builder: Component {
-                Browser {}
-            }
-        }
-        */
-
-
-        // file dialog
-        /*
-
-        Button {
-            text: "Open Directory"
-            property var builder: Component {
-                FileDialog { selectDirectory: true }
-            }
-
-            onClicked: {
-                var fileDialog = builder.createObject(desktop);
-                fileDialog.canceled.connect(function(){
-                    console.log("Cancelled")
-                })
-                fileDialog.selectedFile.connect(function(file){
-                    console.log("Selected " + file)
-                })
-            }
-        }
-        Button {
-            text: "Open File"
-            property var builder: Component {
-                FileDialog {
-                    title: "Open File"
-                    filter: "All Files (*.*)"
-                    //filter: "HTML files (*.html);;Other(*.png)"
-                }
-            }
-
-            onClicked: {
-                var fileDialog = builder.createObject(desktop);
-                fileDialog.canceled.connect(function(){
-                    console.log("Cancelled")
-                })
-                fileDialog.selectedFile.connect(function(file){
-                    console.log("Selected " + file)
-                })
-            }
-        }
-        */
-
-        // tabs
-        /*
-        Button {
-            text: "Add Tab"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo" });
-                desktop.toolWindow.showTabForUrl("Foo", true);
-            }
-        }
-
-        Button {
-            text: "Add Tab 2"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo 2" });
-                desktop.toolWindow.showTabForUrl("Foo 2", true);
-            }
-        }
-
-        Button {
-            text: "Add Tab 3"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.addWebTab({ source: "Foo 3" });
-                desktop.toolWindow.showTabForUrl("Foo 3", true);
-            }
-        }
-
-        Button {
-            text: "Destroy Tab"
-            onClicked: {
-                console.log(desktop.toolWindow);
-                desktop.toolWindow.removeTabForUrl("Foo");
-            }
-        }
-        */
-
-        // Hifi specific stuff
-        /*
-        Button {
-            // Shows the dialog with preferences sections but not each section's preference items
-            // because Preferences.preferencesByCategory() method is not stubbed out.
-            text: "Settings > General..."
-            property var builder: Component {
-                GeneralPreferencesDialog { }
-            }
-            onClicked: {
-                var runningScripts = builder.createObject(desktop);
-            }
-        }
-
-        Button {
-            text: "Running Scripts"
-            property var builder: Component {
-                RunningScripts { }
-            }
-            onClicked: {
-                var runningScripts = builder.createObject(desktop);
-            }
-        }
-
-        Button {
-            text: "Attachments"
-            property var builder: Component {
-                AttachmentsDialog { }
-            }
-            onClicked: {
-                var attachmentsDialog = builder.createObject(desktop);
-            }
-        }
-        Button {
-            // Replicates message box that pops up after selecting new avatar. Includes title.
-            text: "Confirm Avatar"
-            onClicked: {
-                var messageBox = desktop.messageBox({
-                                       title: "Set Avatar",
-                                       text: "Would you like to use 'Albert' for your avatar?",
-                                       icon: hifi.icons.question,         // Test question icon
-                                       //icon: hifi.icons.information,    // Test informaton icon
-                                       //icon: hifi.icons.warning,        // Test warning icon
-                                       //icon: hifi.icons.critical,       // Test critical icon
-                                       //icon: hifi.icons.none,         // Test no icon
-                                       buttons: OriginalDialogs.StandardButton.Ok + OriginalDialogs.StandardButton.Cancel,
-                                       defaultButton: OriginalDialogs.StandardButton.Ok
-                                   });
-                messageBox.selected.connect(function(button) {
-                    console.log("You clicked " + button)
-                })
-            }
-        }
-        */
-        // bookmarks
-        /*
-        Button {
-            text: "Bookmark Location"
-            onClicked: {
-                desktop.inputDialog({
-                                       title: "Bookmark Location",
-                                       icon: hifi.icons.placemark,
-                                       label: "Name"
-                                   });
-            }
-        }
-        Button {
-            text: "Delete Bookmark"
-            onClicked: {
-                desktop.inputDialog({
-                                       title: "Delete Bookmark",
-                                       icon: hifi.icons.placemark,
-                                       label: "Select the bookmark to delete",
-                                       items: ["Bookmark A", "Bookmark B", "Bookmark C"]
-                                   });
-            }
-        }
-        Button {
-            text: "Duplicate Bookmark"
-            onClicked: {
-                desktop.messageBox({
-                                       title: "Duplicate Bookmark",
-                                       icon: hifi.icons.warning,
-                                       text: "The bookmark name you entered alread exists in yoru list.",
-                                       informativeText: "Would you like to overwrite it?",
-                                       buttons: OriginalDialogs.StandardButton.Yes + OriginalDialogs.StandardButton.No,
-                                       defaultButton: OriginalDialogs.StandardButton.Yes
-                                   });
-            }
-        }
-        */
-
-    }
-
-
-    HifiConstants { id: hifi }
-
-    Desktop {
-        id: desktop
-        anchors.fill: parent
-
-        //rootMenu: StubMenu { id: rootMenu }
-        //Component.onCompleted: offscreenWindow = appWindow
-
-        /*
-        MouseArea {
-            anchors.fill: parent
-            acceptedButtons: Qt.RightButton
-            onClicked: desktop.popupMenu(Qt.vector2d(mouseX, mouseY));
-        }
-        */
-
-        Browser {
-            url: "http://s3.amazonaws.com/DreamingContent/testUiDelegates.html"
-        }
-
-
-        Window {
-            id: blue
-            closable: true
-            visible: true
-            resizable: true
-            destroyOnHidden: false
-            title: "Blue"
-
-            width: 100; height: 100
-            x: 1280 / 2; y: 720 / 2
-            Settings {
-                category: "TestWindow.Blue"
-                property alias x: blue.x
-                property alias y: blue.y
-                property alias width: blue.width
-                property alias height: blue.height
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "blue"
-                Component.onDestruction: console.log("Blue destroyed")
-            }
-        }
-
-        Window {
-            id: green
-            closable: true
-            visible: true
-            resizable: true
-            title: "Green"
-            destroyOnHidden: false
-
-            width: 100; height: 100
-            x: 1280 / 2; y: 720 / 2
-            Settings {
-                category: "TestWindow.Green"
-                property alias x: green.x
-                property alias y: green.y
-                property alias width: green.width
-                property alias height: green.height
-            }
-
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "green"
-                Component.onDestruction: console.log("Green destroyed")
-            }
-        }
-
-/*
-        Rectangle { width: 100; height: 100; x: 100; y: 100; color: "#00f" }
-
-        Window {
-            id: green
-            alwaysOnTop: true
-            frame: HiddenFrame{}
-            hideBackground: true
-            closable: true
-            visible: true
-            resizable: false
-            x: 1280 / 2; y: 720 / 2
-            width: 100; height: 100
-            Rectangle {
-                color: "#0f0"
-                width: green.width;
-                height: green.height;
-            }
-        }
-        */
-
-/*
-        Window {
-            id: yellow
-            closable: true
-            visible: true
-            resizable: true
-            x: 100; y: 100
-            width: 100; height: 100
-            Rectangle {
-                anchors.fill: parent
-                visible: true
-                color: "yellow"
-            }
-        }
-*/
-    }
-
-    Action {
-        id: openBrowserAction
-        text: "Open Browser"
-        shortcut: "Ctrl+Shift+X"
-        onTriggered: {
-            builder.createObject(desktop);
-        }
-        property var builder: Component {
-            ModelBrowserDialog{}
-        }
-    }
-}
-
-
-
-
diff --git a/tests-manual/ui/qmlscratch.pro b/tests-manual/ui/qmlscratch.pro
index 5c9b91ee52..3287180d26 100644
--- a/tests-manual/ui/qmlscratch.pro
+++ b/tests-manual/ui/qmlscratch.pro
@@ -4,34 +4,10 @@ QT += gui qml quick xml webengine widgets
 
 CONFIG += c++11
 
-SOURCES += src/main.cpp \
-    ../../libraries/ui/src/FileDialogHelper.cpp
-
-HEADERS += \
-    ../../libraries/ui/src/FileDialogHelper.h
+SOURCES += src/main.cpp
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
 QML_IMPORT_PATH = ../../interface/resources/qml
 
-
 DISTFILES += \
-    qml/*.qml \
-    ../../interface/resources/QtWebEngine/UIDelegates/original/*.qml \
-    ../../interface/resources/QtWebEngine/UIDelegates/*.qml \
-    ../../interface/resources/qml/*.qml \
-    ../../interface/resources/qml/controls/*.qml \
-    ../../interface/resources/qml/controls-uit/*.qml \
-    ../../interface/resources/qml/dialogs/*.qml \
-    ../../interface/resources/qml/dialogs/fileDialog/*.qml \
-    ../../interface/resources/qml/dialogs/preferences/*.qml \
-    ../../interface/resources/qml/dialogs/messageDialog/*.qml \
-    ../../interface/resources/qml/desktop/*.qml \
-    ../../interface/resources/qml/menus/*.qml \
-    ../../interface/resources/qml/styles/*.qml \
-    ../../interface/resources/qml/styles-uit/*.qml \
-    ../../interface/resources/qml/windows/*.qml \
-    ../../interface/resources/qml/hifi/*.qml \
-    ../../interface/resources/qml/hifi/toolbars/*.qml \
-    ../../interface/resources/qml/hifi/dialogs/*.qml \
-    ../../interface/resources/qml/hifi/dialogs/preferences/*.qml \
-    ../../interface/resources/qml/hifi/overlays/*.qml
+    qml/*.qml
diff --git a/tests-manual/ui/src/main.cpp b/tests-manual/ui/src/main.cpp
index 312b5f3823..a5061f4d01 100644
--- a/tests-manual/ui/src/main.cpp
+++ b/tests-manual/ui/src/main.cpp
@@ -3,88 +3,31 @@
 #include <QtWebEngine>
 #include <QFileSystemModel>
 
-#include "../../../libraries/ui/src/FileDialogHelper.h"
-
-
-class Preference : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString category READ getCategory() CONSTANT)
-    Q_PROPERTY(QString name READ getName() CONSTANT)
-    Q_PROPERTY(Type type READ getType() CONSTANT)
-    Q_ENUMS(Type)
-public:
-    enum Type {
-        Editable,
-        Browsable,
-        Spinner,
-        Checkbox,
-    };
-
-    Preference(QObject* parent = nullptr) : QObject(parent) {}
-
-    Preference(const QString& category, const QString& name, QObject* parent = nullptr)
-        : QObject(parent), _category(category), _name(name) { }
-    const QString& getCategory() const { return _category; }
-    const QString& getName() const { return _name; }
-    virtual Type getType() { return Editable; }
-
-protected:
-    const QString _category;
-    const QString _name;
-};
-
-class Reticle : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QPoint position READ getPosition CONSTANT)
-public:
-
-    Reticle(QObject* parent) : QObject(parent) {
-    }
-
-    QPoint getPosition() {
-        if (!_window) {
-            return QPoint(0, 0);
-        }
-        return _window->mapFromGlobal(QCursor::pos());
-    }
-
-    void setWindow(QWindow* window) {
-        _window = window;
-    }
-
-private:
-    QWindow* _window{nullptr};
-};
-
 QString getRelativeDir(const QString& relativePath = ".") {
-    QDir path(__FILE__); path.cdUp();
+    QDir path(__FILE__);
+    path.cdUp();
+    path.cdUp();
     auto result = path.absoluteFilePath(relativePath);
     result = path.cleanPath(result) + "/";
     return result;
 }
 
-QString getTestQmlDir() {
-    return getRelativeDir("../qml");
+QString getResourcesDir() {
+    return getRelativeDir("../../interface/resources");
 }
 
-QString getInterfaceQmlDir() {
-    return getRelativeDir("/");
+QString getQmlDir() {
+    return getRelativeDir("../../interface/resources/qml");
 }
 
-
-void setChild(QQmlApplicationEngine& engine, const char* name) {
-  for (auto obj : engine.rootObjects()) {
-    auto child = obj->findChild<QObject*>(QString(name));
-    if (child) {
-      engine.rootContext()->setContextProperty(name, child);
-      return;
-    }
-  }
-  qWarning() << "Could not find object named " << name;
+QString getScriptsDir() {
+    return getRelativeDir("../../scripts");
 }
 
 void addImportPath(QQmlApplicationEngine& engine, const QString& relativePath, bool insert = false) {
     QString resolvedPath = getRelativeDir(relativePath);
+
+    qDebug() << "adding import path: " << QDir::toNativeSeparators(resolvedPath);
     engine.addImportPath(resolvedPath);
 }
 
@@ -93,44 +36,24 @@ int main(int argc, char *argv[]) {
     app.setOrganizationName("Some Company");
     app.setOrganizationDomain("somecompany.com");
     app.setApplicationName("Amazing Application");
-    QDir::setCurrent(getRelativeDir(".."));
 
-    QtWebEngine::initialize();
-    qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
+    auto scriptsDir = getScriptsDir();
+    auto resourcesDir = getResourcesDir();
 
     QQmlApplicationEngine engine;
+    addImportPath(engine, ".");
     addImportPath(engine, "qml");
-    addImportPath(engine, "../../interface/resources/qml");
-    addImportPath(engine, "../../interface/resources");
-    engine.load(QUrl(QStringLiteral("qml/Stubs.qml")));
+    addImportPath(engine, resourcesDir);
+    addImportPath(engine, resourcesDir + "/qml");
+    addImportPath(engine, scriptsDir);
+    addImportPath(engine, scriptsDir + "/developer/tests");
 
-    setChild(engine, "offscreenFlags");
-    setChild(engine, "Account");
-    setChild(engine, "ApplicationCompositor");
-    setChild(engine, "Controller");
-    setChild(engine, "Desktop");
-    setChild(engine, "ScriptDiscoveryService");
-    setChild(engine, "HMD");
-    setChild(engine, "GL");
-    setChild(engine, "MenuHelper");
-    setChild(engine, "Preferences");
-    setChild(engine, "urlHandler");
-    engine.rootContext()->setContextProperty("DebugQML", true);
-    engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-Regular.ttf");
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/FiraSans-SemiBold.ttf");
+    QFontDatabase::addApplicationFont(resourcesDir + "/fonts/hifi-glyphs.ttf");
 
-    //engine.load(QUrl(QStringLiteral("qrc:/qml/gallery/main.qml")));
-    engine.load(QUrl(QStringLiteral("qml/main.qml")));
-    for (QObject* rootObject : engine.rootObjects()) {
-        if (rootObject->objectName() == "MainWindow") {
-            Reticle* reticle = new Reticle(rootObject);
-            reticle->setWindow((QWindow*)rootObject);
-            engine.rootContext()->setContextProperty("Reticle", reticle);
-            engine.rootContext()->setContextProperty("Window", rootObject);
-            break;
-        }
-    }
+    auto url = getRelativeDir(".") + "qml/ControlsGalleryWindow.qml";
+
+    engine.load(url);
     return app.exec();
 }
-
-#include "main.moc"
-

From 2296848fcb9f4255d144ffcc773703f1bd196ba8 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Thu, 28 Jun 2018 16:58:45 -0700
Subject: [PATCH 65/73] Adding potential fix for showing audio stats - depends
 on PR#13401

---
 scripts/developer/utilities/audio/Stats.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/developer/utilities/audio/Stats.qml b/scripts/developer/utilities/audio/Stats.qml
index f359e9b04c..e2291e485d 100644
--- a/scripts/developer/utilities/audio/Stats.qml
+++ b/scripts/developer/utilities/audio/Stats.qml
@@ -12,7 +12,7 @@ import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:////qml//controls-uit" as HifiControls
+import controlsUit 1.0 as HifiControls
 
 Column {
     id: stats

From c6764c62445497e08617848bf9ad01a74fe3c281 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Mon, 16 Jul 2018 23:59:06 +0300
Subject: [PATCH 66/73] cherry-picking

---
 interface/resources/qml/InteractiveWindow.qml                | 4 ++--
 interface/resources/qml/hifi/AvatarApp.qml                   | 4 ++--
 interface/resources/qml/hifi/avatarapp/AdjustWearables.qml   | 5 ++---
 interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml   | 2 +-
 interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml    | 2 +-
 .../qml/hifi/avatarapp/AvatarWearablesIndicator.qml          | 4 ++--
 interface/resources/qml/hifi/avatarapp/BlueButton.qml        | 4 ++--
 .../resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml    | 4 ++--
 interface/resources/qml/hifi/avatarapp/InputField.qml        | 4 ++--
 interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml   | 4 ++--
 interface/resources/qml/hifi/avatarapp/MessageBox.qml        | 4 ++--
 interface/resources/qml/hifi/avatarapp/Settings.qml          | 4 ++--
 interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml       | 2 +-
 interface/resources/qml/hifi/avatarapp/ShadowImage.qml       | 2 +-
 interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml   | 2 +-
 interface/resources/qml/hifi/avatarapp/SquareLabel.qml       | 4 ++--
 interface/resources/qml/hifi/avatarapp/Vector3.qml           | 4 ++--
 interface/resources/qml/hifi/avatarapp/WhiteButton.qml       | 4 ++--
 .../commerce/marketplaceItemTester/MarketplaceItemTester.qml | 5 +++--
 interface/resources/qml/hifi/tablet/EditEntityList.qml       | 4 ++--
 interface/resources/qml/hifi/tablet/EditToolsTabView.qml     | 4 ++--
 21 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/interface/resources/qml/InteractiveWindow.qml b/interface/resources/qml/InteractiveWindow.qml
index e8ddbf823d..c217238e93 100644
--- a/interface/resources/qml/InteractiveWindow.qml
+++ b/interface/resources/qml/InteractiveWindow.qml
@@ -12,9 +12,9 @@ import QtQuick 2.3
 
 import "windows" as Windows
 import "controls"
-import "controls-uit" as Controls
+import controlsUit 1.0 as Controls
 import "styles"
-import "styles-uit"
+import stylesUit 1.0
 
 Windows.Window {
     id: root;
diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml
index aea5931627..39590748cf 100644
--- a/interface/resources/qml/hifi/AvatarApp.qml
+++ b/interface/resources/qml/hifi/AvatarApp.qml
@@ -3,8 +3,8 @@ import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
 import QtQml.Models 2.1
 import QtGraphicalEffects 1.0
-import "../controls-uit" as HifiControls
-import "../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 import "avatarapp"
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
index 5fff14e4a1..0740914440 100644
--- a/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
+++ b/interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
@@ -1,9 +1,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Layouts 1.3
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
-import "../../controls" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 Rectangle {
     id: root;
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
index 9d9db010fb..d3c9cd1d5f 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
@@ -1,6 +1,6 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
+import stylesUit 1.0
 
 ShadowRectangle {
     id: header
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
index f66c7121cb..36cb4b1080 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarAppStyle.qml
@@ -10,7 +10,7 @@
 
 import QtQuick 2.5
 import QtQuick.Window 2.2
-import "../../styles-uit"
+import stylesUit 1.0
 
 QtObject {
 	readonly property QtObject colors: QtObject {
diff --git a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
index cb73e9fe71..8b28d4c66b 100644
--- a/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
+++ b/interface/resources/qml/hifi/avatarapp/AvatarWearablesIndicator.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.9
-import "../../controls-uit"
-import "../../styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 ShadowRectangle {
     property int wearablesCount: 0
diff --git a/interface/resources/qml/hifi/avatarapp/BlueButton.qml b/interface/resources/qml/hifi/avatarapp/BlueButton.qml
index e668951517..0cc84d5ba0 100644
--- a/interface/resources/qml/hifi/avatarapp/BlueButton.qml
+++ b/interface/resources/qml/hifi/avatarapp/BlueButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 HifiControlsUit.Button {
     HifiConstants {
diff --git a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
index 1387c0791a..780981a5a3 100644
--- a/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
+++ b/interface/resources/qml/hifi/avatarapp/CreateFavoriteDialog.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/InputField.qml b/interface/resources/qml/hifi/avatarapp/InputField.qml
index 905518ef0f..2020d56c96 100644
--- a/interface/resources/qml/hifi/avatarapp/InputField.qml
+++ b/interface/resources/qml/hifi/avatarapp/InputField.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 2.2
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 TextField {
     id: textField
diff --git a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
index 4b868b47ce..6c2101498c 100644
--- a/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
+++ b/interface/resources/qml/hifi/avatarapp/InputTextStyle4.qml
@@ -1,5 +1,5 @@
-import "../../controls-uit" as HifiControlsUit
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControlsUit
+import stylesUit 1.0
 
 import QtQuick 2.0
 import QtQuick.Controls 2.2
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBox.qml b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
index f111303214..eb28745b1a 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBox.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/Settings.qml b/interface/resources/qml/hifi/avatarapp/Settings.qml
index 3446191163..bad1394133 100644
--- a/interface/resources/qml/hifi/avatarapp/Settings.qml
+++ b/interface/resources/qml/hifi/avatarapp/Settings.qml
@@ -2,8 +2,8 @@ import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtQuick.Controls 2.2
 import QtQuick.Layouts 1.3
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Rectangle {
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml b/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
index c2d84bb371..a2c84fad47 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowGlyph.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowImage.qml b/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
index 3995446e49..51e1043702 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowImage.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml b/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
index 741fce3d8d..3968fcb1ff 100644
--- a/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
+++ b/interface/resources/qml/hifi/avatarapp/ShadowRectangle.qml
@@ -1,4 +1,4 @@
-import "../../styles-uit"
+import stylesUit 1.0
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/SquareLabel.qml b/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
index e2c456ec04..69aff47373 100644
--- a/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
+++ b/interface/resources/qml/hifi/avatarapp/SquareLabel.qml
@@ -1,5 +1,5 @@
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import QtQuick 2.9
 import QtGraphicalEffects 1.0
 
diff --git a/interface/resources/qml/hifi/avatarapp/Vector3.qml b/interface/resources/qml/hifi/avatarapp/Vector3.qml
index d77665f992..698123104f 100644
--- a/interface/resources/qml/hifi/avatarapp/Vector3.qml
+++ b/interface/resources/qml/hifi/avatarapp/Vector3.qml
@@ -1,7 +1,7 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 import "../../controls" as HifiControls
 
 Row {
diff --git a/interface/resources/qml/hifi/avatarapp/WhiteButton.qml b/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
index dc729ae097..d0a4a152db 100644
--- a/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
+++ b/interface/resources/qml/hifi/avatarapp/WhiteButton.qml
@@ -1,6 +1,6 @@
 import QtQuick 2.5
-import "../../styles-uit"
-import "../../controls-uit" as HifiControlsUit
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControlsUit
 
 HifiControlsUit.Button {
     HifiConstants {
diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
index 2a4f2d0e22..a37a0ac756 100644
--- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
+++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
@@ -15,8 +15,9 @@ import QtQuick 2.10
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.3
 import Hifi 1.0 as Hifi
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
+
 
 
 
diff --git a/interface/resources/qml/hifi/tablet/EditEntityList.qml b/interface/resources/qml/hifi/tablet/EditEntityList.qml
index d484885103..d2fb99ea0a 100644
--- a/interface/resources/qml/hifi/tablet/EditEntityList.qml
+++ b/interface/resources/qml/hifi/tablet/EditEntityList.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 
 WebView {
diff --git a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
index 13b1caf8fb..dc7ad683e3 100644
--- a/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
+++ b/interface/resources/qml/hifi/tablet/EditToolsTabView.qml
@@ -4,8 +4,8 @@ import QtWebChannel 1.0
 import "../../controls"
 import "../toolbars"
 import QtGraphicalEffects 1.0
-import "../../controls-uit" as HifiControls
-import "../../styles-uit"
+import controlsUit 1.0 as HifiControls
+import stylesUit 1.0
 
 TabBar {
     id: editTabView

From 82313f9464d5e3aa410845f68e13c1e02458f274 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Thu, 18 Oct 2018 22:03:50 +0300
Subject: [PATCH 67/73] update imports for utilities / all other qml files
 found

---
 interface/resources/QtWebEngine/UIDelegates/Menu.qml          | 4 ++--
 interface/resources/QtWebEngine/UIDelegates/MenuItem.qml      | 4 ++--
 interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml  | 4 ++--
 scripts/developer/utilities/audio/TabletStats.qml             | 3 +--
 scripts/developer/utilities/lib/jet/qml/TaskList.qml          | 4 ++--
 scripts/developer/utilities/lib/jet/qml/TaskListView.qml      | 4 ++--
 scripts/developer/utilities/lib/plotperf/Color.qml            | 4 ++--
 scripts/developer/utilities/render/antialiasing.qml           | 4 ++--
 .../developer/utilities/render/configSlider/ConfigSlider.qml  | 4 ++--
 .../developer/utilities/render/configSlider/RichSlider.qml    | 4 ++--
 scripts/developer/utilities/render/deferredLighting.qml       | 4 ++--
 scripts/developer/utilities/render/engineInspector.qml        | 4 ++--
 scripts/developer/utilities/render/highlight.qml              | 4 ++--
 .../developer/utilities/render/highlight/HighlightStyle.qml   | 4 ++--
 scripts/developer/utilities/render/lod.qml                    | 4 ++--
 scripts/developer/utilities/render/shadow.qml                 | 4 ++--
 scripts/developer/utilities/render/transition.qml             | 4 ++--
 scripts/developer/utilities/workload/workloadInspector.qml    | 4 ++--
 .../marketplace/spectator-camera/SpectatorCamera.qml          | 4 ++--
 19 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/interface/resources/QtWebEngine/UIDelegates/Menu.qml b/interface/resources/QtWebEngine/UIDelegates/Menu.qml
index 46c00e758e..adfd29df9e 100644
--- a/interface/resources/QtWebEngine/UIDelegates/Menu.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/Menu.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: menu
diff --git a/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml b/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
index 6014b6834b..b4d3ca4bb2 100644
--- a/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/MenuItem.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 
 Item {
     id: root
diff --git a/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml b/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
index e4ab3037ef..089c745571 100644
--- a/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
+++ b/interface/resources/QtWebEngine/UIDelegates/PromptDialog.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.5
 
-import "../../qml/controls-uit"
-import "../../qml/styles-uit"
+import controlsUit 1.0
+import stylesUit 1.0
 import "../../qml/dialogs"
 
 QtObject {
diff --git a/scripts/developer/utilities/audio/TabletStats.qml b/scripts/developer/utilities/audio/TabletStats.qml
index 2f8d212a2a..b50acabec4 100644
--- a/scripts/developer/utilities/audio/TabletStats.qml
+++ b/scripts/developer/utilities/audio/TabletStats.qml
@@ -11,8 +11,7 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
-
-import "qrc:////qml//styles-uit"
+import stylesUit 1.0
 
 Item {
     id: dialog
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskList.qml b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
index 5b1aa0afb5..166f604666 100644
--- a/scripts/developer/utilities/lib/jet/qml/TaskList.qml
+++ b/scripts/developer/utilities/lib/jet/qml/TaskList.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../jet.js" as Jet
 
diff --git a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
index 2c75865698..0f083aa72c 100644
--- a/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
+++ b/scripts/developer/utilities/lib/jet/qml/TaskListView.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../jet.js" as Jet
 
diff --git a/scripts/developer/utilities/lib/plotperf/Color.qml b/scripts/developer/utilities/lib/plotperf/Color.qml
index 15d7f9fcc9..1ad72fe2e6 100644
--- a/scripts/developer/utilities/lib/plotperf/Color.qml
+++ b/scripts/developer/utilities/lib/plotperf/Color.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/antialiasing.qml b/scripts/developer/utilities/render/antialiasing.qml
index 1a8f9dac2d..5abfd30935 100644
--- a/scripts/developer/utilities/render/antialiasing.qml
+++ b/scripts/developer/utilities/render/antialiasing.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
     
 import "configSlider"
 import "../lib/plotperf"
diff --git a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
index 41de77fb09..bf9089d82c 100644
--- a/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/ConfigSlider.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/configSlider/RichSlider.qml b/scripts/developer/utilities/render/configSlider/RichSlider.qml
index 01b14f3d48..ff16cb32ad 100644
--- a/scripts/developer/utilities/render/configSlider/RichSlider.qml
+++ b/scripts/developer/utilities/render/configSlider/RichSlider.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4 as Original
 import QtQuick.Controls.Styles 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 
 Item {
diff --git a/scripts/developer/utilities/render/deferredLighting.qml b/scripts/developer/utilities/render/deferredLighting.qml
index a9479b2935..64e00acdac 100644
--- a/scripts/developer/utilities/render/deferredLighting.qml
+++ b/scripts/developer/utilities/render/deferredLighting.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import "../lib/jet/qml" as Jet
 
diff --git a/scripts/developer/utilities/render/engineInspector.qml b/scripts/developer/utilities/render/engineInspector.qml
index 1b9941e64e..16dd8eb985 100644
--- a/scripts/developer/utilities/render/engineInspector.qml
+++ b/scripts/developer/utilities/render/engineInspector.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../lib/jet/qml" as Jet
 
diff --git a/scripts/developer/utilities/render/highlight.qml b/scripts/developer/utilities/render/highlight.qml
index 88d6a807ae..d8af2a828e 100644
--- a/scripts/developer/utilities/render/highlight.qml
+++ b/scripts/developer/utilities/render/highlight.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import  "../lib/plotperf"
 import  "highlight"
diff --git a/scripts/developer/utilities/render/highlight/HighlightStyle.qml b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
index 371b7e81f7..475aadfdce 100644
--- a/scripts/developer/utilities/render/highlight/HighlightStyle.qml
+++ b/scripts/developer/utilities/render/highlight/HighlightStyle.qml
@@ -12,8 +12,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 import "../configSlider"
 import "../../lib/plotperf"
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 Item {
     id: root
diff --git a/scripts/developer/utilities/render/lod.qml b/scripts/developer/utilities/render/lod.qml
index 889d8db836..892b43d8be 100644
--- a/scripts/developer/utilities/render/lod.qml
+++ b/scripts/developer/utilities/render/lod.qml
@@ -11,8 +11,8 @@
 import QtQuick 2.5
 import QtQuick.Controls 1.4
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 
 import "../lib/plotperf"
 import "configSlider"
diff --git a/scripts/developer/utilities/render/shadow.qml b/scripts/developer/utilities/render/shadow.qml
index 464fe00eb9..a1d6777a68 100644
--- a/scripts/developer/utilities/render/shadow.qml
+++ b/scripts/developer/utilities/render/shadow.qml
@@ -12,8 +12,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
     
 import "configSlider"
 
diff --git a/scripts/developer/utilities/render/transition.qml b/scripts/developer/utilities/render/transition.qml
index f74468a273..c150c523f9 100644
--- a/scripts/developer/utilities/render/transition.qml
+++ b/scripts/developer/utilities/render/transition.qml
@@ -13,8 +13,8 @@ import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 import QtQuick.Dialogs 1.0
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import  "configSlider"
 import "../lib/plotperf"
 
diff --git a/scripts/developer/utilities/workload/workloadInspector.qml b/scripts/developer/utilities/workload/workloadInspector.qml
index 2eaa9d8133..746a572f29 100644
--- a/scripts/developer/utilities/workload/workloadInspector.qml
+++ b/scripts/developer/utilities/workload/workloadInspector.qml
@@ -11,8 +11,8 @@ import QtQuick 2.7
 import QtQuick.Controls 1.4
 import QtQuick.Layouts 1.3
 
-import "qrc:///qml/styles-uit"
-import "qrc:///qml/controls-uit" as HifiControls
+import stylesUit 1.0
+import controlsUit 1.0 as HifiControls
 import "../render/configSlider"
 import "../lib/jet/qml" as Jet
 import "../lib/plotperf"
diff --git a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
index 033039b87d..753771987a 100644
--- a/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
+++ b/unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
@@ -16,8 +16,8 @@ import QtQuick 2.7
 import QtQuick.Controls 2.2
 import QtGraphicalEffects 1.0
 
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 import "qrc:////qml//hifi" as Hifi
 

From f7d9bafc7d629c4ae46bd0cdebc8d9fa8556f713 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Wed, 24 Oct 2018 00:28:55 +0300
Subject: [PATCH 68/73] add FilterBar & ScrollBar to qmldir

---
 interface/resources/qml/controlsUit/qmldir | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/interface/resources/qml/controlsUit/qmldir b/interface/resources/qml/controlsUit/qmldir
index 989115b8d2..d0577f5575 100644
--- a/interface/resources/qml/controlsUit/qmldir
+++ b/interface/resources/qml/controlsUit/qmldir
@@ -6,6 +6,7 @@ CheckBox 1.0 CheckBox.qml
 CheckBoxQQC2 1.0 CheckBoxQQC2.qml
 ComboBox 1.0 ComboBox.qml
 ContentSection 1.0 ContentSection.qml
+FilterBar 1.0 FilterBar.qml
 GlyphButton 1.0 GlyphButton.qml
 HorizontalRule 1.0 HorizontalRule.qml
 HorizontalSpacer 1.0 HorizontalSpacer.qml
@@ -15,6 +16,7 @@ Keyboard 1.0 Keyboard.qml
 Label 1.0 Label.qml
 QueuedButton 1.0 QueuedButton.qml
 RadioButton 1.0 RadioButton.qml
+ScrollBar 1.0 ScrollBar.qml
 Separator 1.0 Separator.qml
 Slider 1.0 Slider.qml
 SpinBox 1.0 SpinBox.qml

From fe4e4cfbd4b2bdf87d15f091d3e679be4314856a Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Wed, 24 Oct 2018 01:40:10 +0300
Subject: [PATCH 69/73] return controls-uit & styles-uit folders to preserve
 backward-compatibility

---
 interface/resources/qml/controls-uit/AttachmentsTable.qml | 8 ++++++++
 interface/resources/qml/controls-uit/BaseWebView.qml      | 8 ++++++++
 interface/resources/qml/controls-uit/Button.qml           | 8 ++++++++
 interface/resources/qml/controls-uit/CheckBox.qml         | 8 ++++++++
 interface/resources/qml/controls-uit/CheckBoxQQC2.qml     | 8 ++++++++
 interface/resources/qml/controls-uit/ComboBox.qml         | 8 ++++++++
 interface/resources/qml/controls-uit/ContentSection.qml   | 8 ++++++++
 interface/resources/qml/controls-uit/FilterBar.qml        | 8 ++++++++
 interface/resources/qml/controls-uit/GlyphButton.qml      | 8 ++++++++
 interface/resources/qml/controls-uit/HorizontalRule.qml   | 8 ++++++++
 interface/resources/qml/controls-uit/HorizontalSpacer.qml | 8 ++++++++
 interface/resources/qml/controls-uit/ImageMessageBox.qml  | 8 ++++++++
 interface/resources/qml/controls-uit/Key.qml              | 8 ++++++++
 interface/resources/qml/controls-uit/Keyboard.qml         | 8 ++++++++
 interface/resources/qml/controls-uit/Label.qml            | 8 ++++++++
 interface/resources/qml/controls-uit/QueuedButton.qml     | 8 ++++++++
 interface/resources/qml/controls-uit/RadioButton.qml      | 8 ++++++++
 interface/resources/qml/controls-uit/ScrollBar.qml        | 8 ++++++++
 interface/resources/qml/controls-uit/Separator.qml        | 8 ++++++++
 interface/resources/qml/controls-uit/Slider.qml           | 8 ++++++++
 interface/resources/qml/controls-uit/SpinBox.qml          | 8 ++++++++
 interface/resources/qml/controls-uit/Switch.qml           | 8 ++++++++
 interface/resources/qml/controls-uit/Table.qml            | 8 ++++++++
 .../resources/qml/controls-uit/TabletContentSection.qml   | 8 ++++++++
 interface/resources/qml/controls-uit/TabletHeader.qml     | 8 ++++++++
 interface/resources/qml/controls-uit/TextAction.qml       | 8 ++++++++
 interface/resources/qml/controls-uit/TextEdit.qml         | 8 ++++++++
 interface/resources/qml/controls-uit/TextField.qml        | 8 ++++++++
 interface/resources/qml/controls-uit/ToolTip.qml          | 8 ++++++++
 interface/resources/qml/controls-uit/Tree.qml             | 8 ++++++++
 interface/resources/qml/controls-uit/VerticalSpacer.qml   | 8 ++++++++
 interface/resources/qml/controls-uit/WebGlyphButton.qml   | 8 ++++++++
 interface/resources/qml/controls-uit/WebSpinner.qml       | 8 ++++++++
 interface/resources/qml/controls-uit/WebView.qml          | 8 ++++++++
 interface/resources/qml/controls-uit/readme.txt           | 1 +
 .../resources/qml/styles-uit/AnonymousProRegular.qml      | 8 ++++++++
 interface/resources/qml/styles-uit/ButtonLabel.qml        | 8 ++++++++
 interface/resources/qml/styles-uit/FiraSansRegular.qml    | 8 ++++++++
 interface/resources/qml/styles-uit/FiraSansSemiBold.qml   | 8 ++++++++
 interface/resources/qml/styles-uit/HiFiGlyphs.qml         | 8 ++++++++
 interface/resources/qml/styles-uit/HifiConstants.qml      | 8 ++++++++
 interface/resources/qml/styles-uit/IconButton.qml         | 8 ++++++++
 interface/resources/qml/styles-uit/InfoItem.qml           | 8 ++++++++
 interface/resources/qml/styles-uit/InputLabel.qml         | 8 ++++++++
 interface/resources/qml/styles-uit/ListItem.qml           | 8 ++++++++
 interface/resources/qml/styles-uit/Logs.qml               | 8 ++++++++
 interface/resources/qml/styles-uit/OverlayTitle.qml       | 8 ++++++++
 interface/resources/qml/styles-uit/RalewayBold.qml        | 8 ++++++++
 interface/resources/qml/styles-uit/RalewayLight.qml       | 8 ++++++++
 interface/resources/qml/styles-uit/RalewayRegular.qml     | 8 ++++++++
 interface/resources/qml/styles-uit/RalewaySemiBold.qml    | 8 ++++++++
 interface/resources/qml/styles-uit/SectionName.qml        | 8 ++++++++
 interface/resources/qml/styles-uit/Separator.qml          | 8 ++++++++
 interface/resources/qml/styles-uit/ShortcutText.qml       | 8 ++++++++
 interface/resources/qml/styles-uit/TabName.qml            | 8 ++++++++
 interface/resources/qml/styles-uit/TextFieldInput.qml     | 8 ++++++++
 interface/resources/qml/styles-uit/readme.txt             | 1 +
 57 files changed, 442 insertions(+)
 create mode 100644 interface/resources/qml/controls-uit/AttachmentsTable.qml
 create mode 100644 interface/resources/qml/controls-uit/BaseWebView.qml
 create mode 100644 interface/resources/qml/controls-uit/Button.qml
 create mode 100644 interface/resources/qml/controls-uit/CheckBox.qml
 create mode 100644 interface/resources/qml/controls-uit/CheckBoxQQC2.qml
 create mode 100644 interface/resources/qml/controls-uit/ComboBox.qml
 create mode 100644 interface/resources/qml/controls-uit/ContentSection.qml
 create mode 100644 interface/resources/qml/controls-uit/FilterBar.qml
 create mode 100644 interface/resources/qml/controls-uit/GlyphButton.qml
 create mode 100644 interface/resources/qml/controls-uit/HorizontalRule.qml
 create mode 100644 interface/resources/qml/controls-uit/HorizontalSpacer.qml
 create mode 100644 interface/resources/qml/controls-uit/ImageMessageBox.qml
 create mode 100644 interface/resources/qml/controls-uit/Key.qml
 create mode 100644 interface/resources/qml/controls-uit/Keyboard.qml
 create mode 100644 interface/resources/qml/controls-uit/Label.qml
 create mode 100644 interface/resources/qml/controls-uit/QueuedButton.qml
 create mode 100644 interface/resources/qml/controls-uit/RadioButton.qml
 create mode 100644 interface/resources/qml/controls-uit/ScrollBar.qml
 create mode 100644 interface/resources/qml/controls-uit/Separator.qml
 create mode 100644 interface/resources/qml/controls-uit/Slider.qml
 create mode 100644 interface/resources/qml/controls-uit/SpinBox.qml
 create mode 100644 interface/resources/qml/controls-uit/Switch.qml
 create mode 100644 interface/resources/qml/controls-uit/Table.qml
 create mode 100644 interface/resources/qml/controls-uit/TabletContentSection.qml
 create mode 100644 interface/resources/qml/controls-uit/TabletHeader.qml
 create mode 100644 interface/resources/qml/controls-uit/TextAction.qml
 create mode 100644 interface/resources/qml/controls-uit/TextEdit.qml
 create mode 100644 interface/resources/qml/controls-uit/TextField.qml
 create mode 100644 interface/resources/qml/controls-uit/ToolTip.qml
 create mode 100644 interface/resources/qml/controls-uit/Tree.qml
 create mode 100644 interface/resources/qml/controls-uit/VerticalSpacer.qml
 create mode 100644 interface/resources/qml/controls-uit/WebGlyphButton.qml
 create mode 100644 interface/resources/qml/controls-uit/WebSpinner.qml
 create mode 100644 interface/resources/qml/controls-uit/WebView.qml
 create mode 100644 interface/resources/qml/controls-uit/readme.txt
 create mode 100644 interface/resources/qml/styles-uit/AnonymousProRegular.qml
 create mode 100644 interface/resources/qml/styles-uit/ButtonLabel.qml
 create mode 100644 interface/resources/qml/styles-uit/FiraSansRegular.qml
 create mode 100644 interface/resources/qml/styles-uit/FiraSansSemiBold.qml
 create mode 100644 interface/resources/qml/styles-uit/HiFiGlyphs.qml
 create mode 100644 interface/resources/qml/styles-uit/HifiConstants.qml
 create mode 100644 interface/resources/qml/styles-uit/IconButton.qml
 create mode 100644 interface/resources/qml/styles-uit/InfoItem.qml
 create mode 100644 interface/resources/qml/styles-uit/InputLabel.qml
 create mode 100644 interface/resources/qml/styles-uit/ListItem.qml
 create mode 100644 interface/resources/qml/styles-uit/Logs.qml
 create mode 100644 interface/resources/qml/styles-uit/OverlayTitle.qml
 create mode 100644 interface/resources/qml/styles-uit/RalewayBold.qml
 create mode 100644 interface/resources/qml/styles-uit/RalewayLight.qml
 create mode 100644 interface/resources/qml/styles-uit/RalewayRegular.qml
 create mode 100644 interface/resources/qml/styles-uit/RalewaySemiBold.qml
 create mode 100644 interface/resources/qml/styles-uit/SectionName.qml
 create mode 100644 interface/resources/qml/styles-uit/Separator.qml
 create mode 100644 interface/resources/qml/styles-uit/ShortcutText.qml
 create mode 100644 interface/resources/qml/styles-uit/TabName.qml
 create mode 100644 interface/resources/qml/styles-uit/TextFieldInput.qml
 create mode 100644 interface/resources/qml/styles-uit/readme.txt

diff --git a/interface/resources/qml/controls-uit/AttachmentsTable.qml b/interface/resources/qml/controls-uit/AttachmentsTable.qml
new file mode 100644
index 0000000000..fdd62b7c84
--- /dev/null
+++ b/interface/resources/qml/controls-uit/AttachmentsTable.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+AttachmentsTable {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml
new file mode 100644
index 0000000000..6ff58d1e47
--- /dev/null
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+BaseWebView {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml
new file mode 100644
index 0000000000..ddadd0038a
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Button {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml
new file mode 100644
index 0000000000..01ffd3c788
--- /dev/null
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+CheckBox {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
new file mode 100644
index 0000000000..9950e4b47f
--- /dev/null
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+CheckBoxQQC2 {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml
new file mode 100644
index 0000000000..74a68706bf
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+ComboBox {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controls-uit/ContentSection.qml
new file mode 100644
index 0000000000..d6cdd92722
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ContentSection.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+ContentSection {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controls-uit/FilterBar.qml
new file mode 100644
index 0000000000..a9b3c350b4
--- /dev/null
+++ b/interface/resources/qml/controls-uit/FilterBar.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+FilterBar {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controls-uit/GlyphButton.qml
new file mode 100644
index 0000000000..e6dbec69a1
--- /dev/null
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+GlyphButton {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/HorizontalRule.qml b/interface/resources/qml/controls-uit/HorizontalRule.qml
new file mode 100644
index 0000000000..b0eaa56778
--- /dev/null
+++ b/interface/resources/qml/controls-uit/HorizontalRule.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+HorizontalRule {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/HorizontalSpacer.qml b/interface/resources/qml/controls-uit/HorizontalSpacer.qml
new file mode 100644
index 0000000000..f9bf73f6e0
--- /dev/null
+++ b/interface/resources/qml/controls-uit/HorizontalSpacer.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+HorizontalSpacer {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/ImageMessageBox.qml b/interface/resources/qml/controls-uit/ImageMessageBox.qml
new file mode 100644
index 0000000000..efdf513b19
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ImageMessageBox.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+ImageMessageBox {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Key.qml b/interface/resources/qml/controls-uit/Key.qml
new file mode 100644
index 0000000000..844cb0c560
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Key.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Key {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controls-uit/Keyboard.qml
new file mode 100644
index 0000000000..5c1622d594
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Keyboard {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml
new file mode 100644
index 0000000000..824f6436bb
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Label.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Label {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/QueuedButton.qml b/interface/resources/qml/controls-uit/QueuedButton.qml
new file mode 100644
index 0000000000..4ec44c16d5
--- /dev/null
+++ b/interface/resources/qml/controls-uit/QueuedButton.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+QueuedButton {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
new file mode 100644
index 0000000000..dab757279c
--- /dev/null
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+RadioButton {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/ScrollBar.qml b/interface/resources/qml/controls-uit/ScrollBar.qml
new file mode 100644
index 0000000000..71c4c956b0
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ScrollBar.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+ScrollBar {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controls-uit/Separator.qml
new file mode 100644
index 0000000000..6be7d7cb40
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Separator.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Separator {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Slider.qml b/interface/resources/qml/controls-uit/Slider.qml
new file mode 100644
index 0000000000..5cdd07a35a
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Slider.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Slider {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml
new file mode 100644
index 0000000000..56f360c286
--- /dev/null
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+SpinBox {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Switch.qml b/interface/resources/qml/controls-uit/Switch.qml
new file mode 100644
index 0000000000..77d1d4e081
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Switch.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Switch {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controls-uit/Table.qml
new file mode 100644
index 0000000000..6ca7675db6
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Table.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Table {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TabletContentSection.qml b/interface/resources/qml/controls-uit/TabletContentSection.qml
new file mode 100644
index 0000000000..0738426f4b
--- /dev/null
+++ b/interface/resources/qml/controls-uit/TabletContentSection.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+TabletContentSection {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TabletHeader.qml b/interface/resources/qml/controls-uit/TabletHeader.qml
new file mode 100644
index 0000000000..689a6e1dfc
--- /dev/null
+++ b/interface/resources/qml/controls-uit/TabletHeader.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+TabletHeader {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TextAction.qml b/interface/resources/qml/controls-uit/TextAction.qml
new file mode 100644
index 0000000000..617418d992
--- /dev/null
+++ b/interface/resources/qml/controls-uit/TextAction.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+TextAction {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controls-uit/TextEdit.qml
new file mode 100644
index 0000000000..99d6b43234
--- /dev/null
+++ b/interface/resources/qml/controls-uit/TextEdit.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+TextEdit {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
new file mode 100644
index 0000000000..8f44823c3b
--- /dev/null
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+TextField {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/ToolTip.qml b/interface/resources/qml/controls-uit/ToolTip.qml
new file mode 100644
index 0000000000..29b98bf572
--- /dev/null
+++ b/interface/resources/qml/controls-uit/ToolTip.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+ToolTip {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controls-uit/Tree.qml
new file mode 100644
index 0000000000..3eca0fa1f6
--- /dev/null
+++ b/interface/resources/qml/controls-uit/Tree.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+Tree {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/VerticalSpacer.qml b/interface/resources/qml/controls-uit/VerticalSpacer.qml
new file mode 100644
index 0000000000..f05b83d9c7
--- /dev/null
+++ b/interface/resources/qml/controls-uit/VerticalSpacer.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+VerticalSpacer {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/WebGlyphButton.qml b/interface/resources/qml/controls-uit/WebGlyphButton.qml
new file mode 100644
index 0000000000..57201edcda
--- /dev/null
+++ b/interface/resources/qml/controls-uit/WebGlyphButton.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+WebGlyphButton {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
new file mode 100644
index 0000000000..4ab8a5475e
--- /dev/null
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+WebSpinner {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controls-uit/WebView.qml
new file mode 100644
index 0000000000..4d2e37903b
--- /dev/null
+++ b/interface/resources/qml/controls-uit/WebView.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import controlsUit 1.0
+
+WebView {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/controls-uit/readme.txt b/interface/resources/qml/controls-uit/readme.txt
new file mode 100644
index 0000000000..8aa3714ff9
--- /dev/null
+++ b/interface/resources/qml/controls-uit/readme.txt
@@ -0,0 +1 @@
+this folder exists purely for compatibility reasons and might be deleted in future! please consider using 'import controlsUit 1.0' instead of including this folder
\ No newline at end of file
diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
new file mode 100644
index 0000000000..09e6c1d0b0
--- /dev/null
+++ b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+AnonymousProRegular {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/ButtonLabel.qml b/interface/resources/qml/styles-uit/ButtonLabel.qml
new file mode 100644
index 0000000000..81f7928240
--- /dev/null
+++ b/interface/resources/qml/styles-uit/ButtonLabel.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+ButtonLabel {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/FiraSansRegular.qml b/interface/resources/qml/styles-uit/FiraSansRegular.qml
new file mode 100644
index 0000000000..d67fba71f8
--- /dev/null
+++ b/interface/resources/qml/styles-uit/FiraSansRegular.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+FiraSansRegular {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
new file mode 100644
index 0000000000..e9f49a5715
--- /dev/null
+++ b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+FiraSansSemiBold {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
new file mode 100644
index 0000000000..129afb732e
--- /dev/null
+++ b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+HiFiGlyphs {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
new file mode 100644
index 0000000000..cf753d5c8d
--- /dev/null
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+HifiConstants {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/IconButton.qml b/interface/resources/qml/styles-uit/IconButton.qml
new file mode 100644
index 0000000000..93f37e9d7a
--- /dev/null
+++ b/interface/resources/qml/styles-uit/IconButton.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+IconButton {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/InfoItem.qml b/interface/resources/qml/styles-uit/InfoItem.qml
new file mode 100644
index 0000000000..57397b4c6f
--- /dev/null
+++ b/interface/resources/qml/styles-uit/InfoItem.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+InfoItem {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/InputLabel.qml b/interface/resources/qml/styles-uit/InputLabel.qml
new file mode 100644
index 0000000000..5b03ca1686
--- /dev/null
+++ b/interface/resources/qml/styles-uit/InputLabel.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+InputLabel {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/ListItem.qml b/interface/resources/qml/styles-uit/ListItem.qml
new file mode 100644
index 0000000000..e98d9bab81
--- /dev/null
+++ b/interface/resources/qml/styles-uit/ListItem.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+ListItem {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/Logs.qml b/interface/resources/qml/styles-uit/Logs.qml
new file mode 100644
index 0000000000..66d2eaeb2e
--- /dev/null
+++ b/interface/resources/qml/styles-uit/Logs.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+Logs {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/OverlayTitle.qml b/interface/resources/qml/styles-uit/OverlayTitle.qml
new file mode 100644
index 0000000000..ec9cf33482
--- /dev/null
+++ b/interface/resources/qml/styles-uit/OverlayTitle.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+OverlayTitle {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/styles-uit/RalewayBold.qml
new file mode 100644
index 0000000000..2370401ba2
--- /dev/null
+++ b/interface/resources/qml/styles-uit/RalewayBold.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+RalewayBold {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/styles-uit/RalewayLight.qml
new file mode 100644
index 0000000000..0641a2746a
--- /dev/null
+++ b/interface/resources/qml/styles-uit/RalewayLight.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+RalewayLight {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/styles-uit/RalewayRegular.qml
new file mode 100644
index 0000000000..cf601f5c91
--- /dev/null
+++ b/interface/resources/qml/styles-uit/RalewayRegular.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+RalewayRegular {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
new file mode 100644
index 0000000000..a3c7cfe864
--- /dev/null
+++ b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+RalewaySemiBold {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/SectionName.qml b/interface/resources/qml/styles-uit/SectionName.qml
new file mode 100644
index 0000000000..b3cb143988
--- /dev/null
+++ b/interface/resources/qml/styles-uit/SectionName.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+SectionName {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/Separator.qml b/interface/resources/qml/styles-uit/Separator.qml
new file mode 100644
index 0000000000..9687fb0520
--- /dev/null
+++ b/interface/resources/qml/styles-uit/Separator.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+Separator {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/ShortcutText.qml b/interface/resources/qml/styles-uit/ShortcutText.qml
new file mode 100644
index 0000000000..921000651a
--- /dev/null
+++ b/interface/resources/qml/styles-uit/ShortcutText.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+ShortcutText {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/TabName.qml b/interface/resources/qml/styles-uit/TabName.qml
new file mode 100644
index 0000000000..001c110a41
--- /dev/null
+++ b/interface/resources/qml/styles-uit/TabName.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+TabName {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/TextFieldInput.qml b/interface/resources/qml/styles-uit/TextFieldInput.qml
new file mode 100644
index 0000000000..ce5bc9edbd
--- /dev/null
+++ b/interface/resources/qml/styles-uit/TextFieldInput.qml
@@ -0,0 +1,8 @@
+import QtQuick 2.0
+import stylesUit 1.0
+
+TextFieldInput {
+    Component.onCompleted: {
+        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
+    }
+}
diff --git a/interface/resources/qml/styles-uit/readme.txt b/interface/resources/qml/styles-uit/readme.txt
new file mode 100644
index 0000000000..105eda3c81
--- /dev/null
+++ b/interface/resources/qml/styles-uit/readme.txt
@@ -0,0 +1 @@
+this folder exists purely for compatibility reasons and might be deleted in future! please consider using 'import stylesUit 1.0' instead of including this folder
\ No newline at end of file

From 9623753416c7bba367ef02d3bc7d43eb3d489b2c Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Wed, 24 Oct 2018 22:44:36 +0300
Subject: [PATCH 70/73] change imports (how could I miss this place?)

---
 .../qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
index 27277a28f4..966f359e92 100644
--- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
+++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
@@ -14,8 +14,8 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import Hifi 1.0 as Hifi
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as HifiControlsUit
 
 Rectangle {
     id: root;

From 4c6700b4973a0437dadc7bc5d8614f60155ad5ec Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Wed, 24 Oct 2018 22:52:28 +0300
Subject: [PATCH 71/73] remove deprecations warnings

---
 interface/resources/qml/controls-uit/AttachmentsTable.qml     | 4 ----
 interface/resources/qml/controls-uit/BaseWebView.qml          | 4 ----
 interface/resources/qml/controls-uit/Button.qml               | 4 ----
 interface/resources/qml/controls-uit/CheckBox.qml             | 4 ----
 interface/resources/qml/controls-uit/CheckBoxQQC2.qml         | 4 ----
 interface/resources/qml/controls-uit/ComboBox.qml             | 4 ----
 interface/resources/qml/controls-uit/ContentSection.qml       | 4 ----
 interface/resources/qml/controls-uit/FilterBar.qml            | 4 ----
 interface/resources/qml/controls-uit/GlyphButton.qml          | 4 ----
 interface/resources/qml/controls-uit/HorizontalRule.qml       | 4 ----
 interface/resources/qml/controls-uit/HorizontalSpacer.qml     | 4 ----
 interface/resources/qml/controls-uit/ImageMessageBox.qml      | 4 ----
 interface/resources/qml/controls-uit/Key.qml                  | 4 ----
 interface/resources/qml/controls-uit/Keyboard.qml             | 4 ----
 interface/resources/qml/controls-uit/Label.qml                | 4 ----
 interface/resources/qml/controls-uit/QueuedButton.qml         | 4 ----
 interface/resources/qml/controls-uit/RadioButton.qml          | 4 ----
 interface/resources/qml/controls-uit/ScrollBar.qml            | 4 ----
 interface/resources/qml/controls-uit/Separator.qml            | 4 ----
 interface/resources/qml/controls-uit/Slider.qml               | 4 ----
 interface/resources/qml/controls-uit/SpinBox.qml              | 4 ----
 interface/resources/qml/controls-uit/Switch.qml               | 4 ----
 interface/resources/qml/controls-uit/Table.qml                | 4 ----
 interface/resources/qml/controls-uit/TabletContentSection.qml | 4 ----
 interface/resources/qml/controls-uit/TabletHeader.qml         | 4 ----
 interface/resources/qml/controls-uit/TextAction.qml           | 4 ----
 interface/resources/qml/controls-uit/TextEdit.qml             | 4 ----
 interface/resources/qml/controls-uit/TextField.qml            | 4 ----
 interface/resources/qml/controls-uit/ToolTip.qml              | 4 ----
 interface/resources/qml/controls-uit/Tree.qml                 | 4 ----
 interface/resources/qml/controls-uit/VerticalSpacer.qml       | 4 ----
 interface/resources/qml/controls-uit/WebGlyphButton.qml       | 4 ----
 interface/resources/qml/controls-uit/WebSpinner.qml           | 4 ----
 interface/resources/qml/controls-uit/WebView.qml              | 4 ----
 interface/resources/qml/styles-uit/AnonymousProRegular.qml    | 4 ----
 interface/resources/qml/styles-uit/ButtonLabel.qml            | 4 ----
 interface/resources/qml/styles-uit/FiraSansRegular.qml        | 4 ----
 interface/resources/qml/styles-uit/FiraSansSemiBold.qml       | 4 ----
 interface/resources/qml/styles-uit/HiFiGlyphs.qml             | 4 ----
 interface/resources/qml/styles-uit/HifiConstants.qml          | 4 ----
 interface/resources/qml/styles-uit/IconButton.qml             | 4 ----
 interface/resources/qml/styles-uit/InfoItem.qml               | 4 ----
 interface/resources/qml/styles-uit/InputLabel.qml             | 4 ----
 interface/resources/qml/styles-uit/ListItem.qml               | 4 ----
 interface/resources/qml/styles-uit/Logs.qml                   | 4 ----
 interface/resources/qml/styles-uit/OverlayTitle.qml           | 4 ----
 interface/resources/qml/styles-uit/RalewayBold.qml            | 4 ----
 interface/resources/qml/styles-uit/RalewayLight.qml           | 4 ----
 interface/resources/qml/styles-uit/RalewayRegular.qml         | 4 ----
 interface/resources/qml/styles-uit/RalewaySemiBold.qml        | 4 ----
 interface/resources/qml/styles-uit/SectionName.qml            | 4 ----
 interface/resources/qml/styles-uit/Separator.qml              | 4 ----
 interface/resources/qml/styles-uit/ShortcutText.qml           | 4 ----
 interface/resources/qml/styles-uit/TabName.qml                | 4 ----
 interface/resources/qml/styles-uit/TextFieldInput.qml         | 4 ----
 55 files changed, 220 deletions(-)

diff --git a/interface/resources/qml/controls-uit/AttachmentsTable.qml b/interface/resources/qml/controls-uit/AttachmentsTable.qml
index fdd62b7c84..e7fe874610 100644
--- a/interface/resources/qml/controls-uit/AttachmentsTable.qml
+++ b/interface/resources/qml/controls-uit/AttachmentsTable.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 AttachmentsTable {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/BaseWebView.qml b/interface/resources/qml/controls-uit/BaseWebView.qml
index 6ff58d1e47..61f428e9f7 100644
--- a/interface/resources/qml/controls-uit/BaseWebView.qml
+++ b/interface/resources/qml/controls-uit/BaseWebView.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 BaseWebView {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml
index ddadd0038a..1d31f02777 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Button {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/CheckBox.qml b/interface/resources/qml/controls-uit/CheckBox.qml
index 01ffd3c788..c10bea08c4 100644
--- a/interface/resources/qml/controls-uit/CheckBox.qml
+++ b/interface/resources/qml/controls-uit/CheckBox.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 CheckBox {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
index 9950e4b47f..af758ee707 100644
--- a/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
+++ b/interface/resources/qml/controls-uit/CheckBoxQQC2.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 CheckBoxQQC2 {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/ComboBox.qml b/interface/resources/qml/controls-uit/ComboBox.qml
index 74a68706bf..8ac92909b6 100644
--- a/interface/resources/qml/controls-uit/ComboBox.qml
+++ b/interface/resources/qml/controls-uit/ComboBox.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 ComboBox {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/ContentSection.qml b/interface/resources/qml/controls-uit/ContentSection.qml
index d6cdd92722..d41b5ad8e6 100644
--- a/interface/resources/qml/controls-uit/ContentSection.qml
+++ b/interface/resources/qml/controls-uit/ContentSection.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 ContentSection {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/FilterBar.qml b/interface/resources/qml/controls-uit/FilterBar.qml
index a9b3c350b4..dede6d2ded 100644
--- a/interface/resources/qml/controls-uit/FilterBar.qml
+++ b/interface/resources/qml/controls-uit/FilterBar.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 FilterBar {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/GlyphButton.qml b/interface/resources/qml/controls-uit/GlyphButton.qml
index e6dbec69a1..3a0f8631a8 100644
--- a/interface/resources/qml/controls-uit/GlyphButton.qml
+++ b/interface/resources/qml/controls-uit/GlyphButton.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 GlyphButton {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/HorizontalRule.qml b/interface/resources/qml/controls-uit/HorizontalRule.qml
index b0eaa56778..7fc2269649 100644
--- a/interface/resources/qml/controls-uit/HorizontalRule.qml
+++ b/interface/resources/qml/controls-uit/HorizontalRule.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 HorizontalRule {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/HorizontalSpacer.qml b/interface/resources/qml/controls-uit/HorizontalSpacer.qml
index f9bf73f6e0..b4f372545c 100644
--- a/interface/resources/qml/controls-uit/HorizontalSpacer.qml
+++ b/interface/resources/qml/controls-uit/HorizontalSpacer.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 HorizontalSpacer {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/ImageMessageBox.qml b/interface/resources/qml/controls-uit/ImageMessageBox.qml
index efdf513b19..484a17dd7c 100644
--- a/interface/resources/qml/controls-uit/ImageMessageBox.qml
+++ b/interface/resources/qml/controls-uit/ImageMessageBox.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 ImageMessageBox {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Key.qml b/interface/resources/qml/controls-uit/Key.qml
index 844cb0c560..c031c2f660 100644
--- a/interface/resources/qml/controls-uit/Key.qml
+++ b/interface/resources/qml/controls-uit/Key.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Key {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Keyboard.qml b/interface/resources/qml/controls-uit/Keyboard.qml
index 5c1622d594..2bdf682b9a 100644
--- a/interface/resources/qml/controls-uit/Keyboard.qml
+++ b/interface/resources/qml/controls-uit/Keyboard.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Keyboard {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Label.qml b/interface/resources/qml/controls-uit/Label.qml
index 824f6436bb..032367208b 100644
--- a/interface/resources/qml/controls-uit/Label.qml
+++ b/interface/resources/qml/controls-uit/Label.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Label {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/QueuedButton.qml b/interface/resources/qml/controls-uit/QueuedButton.qml
index 4ec44c16d5..54d366a663 100644
--- a/interface/resources/qml/controls-uit/QueuedButton.qml
+++ b/interface/resources/qml/controls-uit/QueuedButton.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 QueuedButton {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/RadioButton.qml b/interface/resources/qml/controls-uit/RadioButton.qml
index dab757279c..46eb76e7ce 100644
--- a/interface/resources/qml/controls-uit/RadioButton.qml
+++ b/interface/resources/qml/controls-uit/RadioButton.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 RadioButton {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/ScrollBar.qml b/interface/resources/qml/controls-uit/ScrollBar.qml
index 71c4c956b0..1b21509819 100644
--- a/interface/resources/qml/controls-uit/ScrollBar.qml
+++ b/interface/resources/qml/controls-uit/ScrollBar.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 ScrollBar {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Separator.qml b/interface/resources/qml/controls-uit/Separator.qml
index 6be7d7cb40..baeefc7895 100644
--- a/interface/resources/qml/controls-uit/Separator.qml
+++ b/interface/resources/qml/controls-uit/Separator.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Separator {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Slider.qml b/interface/resources/qml/controls-uit/Slider.qml
index 5cdd07a35a..1bcdbc39b7 100644
--- a/interface/resources/qml/controls-uit/Slider.qml
+++ b/interface/resources/qml/controls-uit/Slider.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Slider {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
\ No newline at end of file
diff --git a/interface/resources/qml/controls-uit/SpinBox.qml b/interface/resources/qml/controls-uit/SpinBox.qml
index 56f360c286..c202a3997c 100644
--- a/interface/resources/qml/controls-uit/SpinBox.qml
+++ b/interface/resources/qml/controls-uit/SpinBox.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 SpinBox {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Switch.qml b/interface/resources/qml/controls-uit/Switch.qml
index 77d1d4e081..96ff7f8898 100644
--- a/interface/resources/qml/controls-uit/Switch.qml
+++ b/interface/resources/qml/controls-uit/Switch.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Switch {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Table.qml b/interface/resources/qml/controls-uit/Table.qml
index 6ca7675db6..3a4932302f 100644
--- a/interface/resources/qml/controls-uit/Table.qml
+++ b/interface/resources/qml/controls-uit/Table.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Table {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/TabletContentSection.qml b/interface/resources/qml/controls-uit/TabletContentSection.qml
index 0738426f4b..70075d3858 100644
--- a/interface/resources/qml/controls-uit/TabletContentSection.qml
+++ b/interface/resources/qml/controls-uit/TabletContentSection.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 TabletContentSection {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/TabletHeader.qml b/interface/resources/qml/controls-uit/TabletHeader.qml
index 689a6e1dfc..53e660d708 100644
--- a/interface/resources/qml/controls-uit/TabletHeader.qml
+++ b/interface/resources/qml/controls-uit/TabletHeader.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 TabletHeader {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/TextAction.qml b/interface/resources/qml/controls-uit/TextAction.qml
index 617418d992..ce5a973776 100644
--- a/interface/resources/qml/controls-uit/TextAction.qml
+++ b/interface/resources/qml/controls-uit/TextAction.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 TextAction {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/TextEdit.qml b/interface/resources/qml/controls-uit/TextEdit.qml
index 99d6b43234..783950bd1e 100644
--- a/interface/resources/qml/controls-uit/TextEdit.qml
+++ b/interface/resources/qml/controls-uit/TextEdit.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 TextEdit {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml
index 8f44823c3b..261a4162ef 100644
--- a/interface/resources/qml/controls-uit/TextField.qml
+++ b/interface/resources/qml/controls-uit/TextField.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 TextField {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/ToolTip.qml b/interface/resources/qml/controls-uit/ToolTip.qml
index 29b98bf572..a5f24c7974 100644
--- a/interface/resources/qml/controls-uit/ToolTip.qml
+++ b/interface/resources/qml/controls-uit/ToolTip.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 ToolTip {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/Tree.qml b/interface/resources/qml/controls-uit/Tree.qml
index 3eca0fa1f6..a21cdc6d47 100644
--- a/interface/resources/qml/controls-uit/Tree.qml
+++ b/interface/resources/qml/controls-uit/Tree.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 Tree {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/VerticalSpacer.qml b/interface/resources/qml/controls-uit/VerticalSpacer.qml
index f05b83d9c7..42b48b003e 100644
--- a/interface/resources/qml/controls-uit/VerticalSpacer.qml
+++ b/interface/resources/qml/controls-uit/VerticalSpacer.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 VerticalSpacer {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/WebGlyphButton.qml b/interface/resources/qml/controls-uit/WebGlyphButton.qml
index 57201edcda..1377b937a2 100644
--- a/interface/resources/qml/controls-uit/WebGlyphButton.qml
+++ b/interface/resources/qml/controls-uit/WebGlyphButton.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 WebGlyphButton {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/WebSpinner.qml b/interface/resources/qml/controls-uit/WebSpinner.qml
index 4ab8a5475e..a20597d8dc 100644
--- a/interface/resources/qml/controls-uit/WebSpinner.qml
+++ b/interface/resources/qml/controls-uit/WebSpinner.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 WebSpinner {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/controls-uit/WebView.qml b/interface/resources/qml/controls-uit/WebView.qml
index 4d2e37903b..b11dee7f3b 100644
--- a/interface/resources/qml/controls-uit/WebView.qml
+++ b/interface/resources/qml/controls-uit/WebView.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import controlsUit 1.0
 
 WebView {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import controlsUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/AnonymousProRegular.qml b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
index 09e6c1d0b0..87a91f183a 100644
--- a/interface/resources/qml/styles-uit/AnonymousProRegular.qml
+++ b/interface/resources/qml/styles-uit/AnonymousProRegular.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 AnonymousProRegular {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/ButtonLabel.qml b/interface/resources/qml/styles-uit/ButtonLabel.qml
index 81f7928240..d677cd06ca 100644
--- a/interface/resources/qml/styles-uit/ButtonLabel.qml
+++ b/interface/resources/qml/styles-uit/ButtonLabel.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 ButtonLabel {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/FiraSansRegular.qml b/interface/resources/qml/styles-uit/FiraSansRegular.qml
index d67fba71f8..65ee891443 100644
--- a/interface/resources/qml/styles-uit/FiraSansRegular.qml
+++ b/interface/resources/qml/styles-uit/FiraSansRegular.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 FiraSansRegular {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
index e9f49a5715..635523feb9 100644
--- a/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
+++ b/interface/resources/qml/styles-uit/FiraSansSemiBold.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 FiraSansSemiBold {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/HiFiGlyphs.qml b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
index 129afb732e..646cfc2988 100644
--- a/interface/resources/qml/styles-uit/HiFiGlyphs.qml
+++ b/interface/resources/qml/styles-uit/HiFiGlyphs.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 HiFiGlyphs {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml
index cf753d5c8d..24b24cf019 100644
--- a/interface/resources/qml/styles-uit/HifiConstants.qml
+++ b/interface/resources/qml/styles-uit/HifiConstants.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 HifiConstants {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/IconButton.qml b/interface/resources/qml/styles-uit/IconButton.qml
index 93f37e9d7a..e60ed9eb10 100644
--- a/interface/resources/qml/styles-uit/IconButton.qml
+++ b/interface/resources/qml/styles-uit/IconButton.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 IconButton {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/InfoItem.qml b/interface/resources/qml/styles-uit/InfoItem.qml
index 57397b4c6f..d09f26649d 100644
--- a/interface/resources/qml/styles-uit/InfoItem.qml
+++ b/interface/resources/qml/styles-uit/InfoItem.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 InfoItem {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/InputLabel.qml b/interface/resources/qml/styles-uit/InputLabel.qml
index 5b03ca1686..89d74afc8f 100644
--- a/interface/resources/qml/styles-uit/InputLabel.qml
+++ b/interface/resources/qml/styles-uit/InputLabel.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 InputLabel {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/ListItem.qml b/interface/resources/qml/styles-uit/ListItem.qml
index e98d9bab81..8d72762644 100644
--- a/interface/resources/qml/styles-uit/ListItem.qml
+++ b/interface/resources/qml/styles-uit/ListItem.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 ListItem {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/Logs.qml b/interface/resources/qml/styles-uit/Logs.qml
index 66d2eaeb2e..d9453afade 100644
--- a/interface/resources/qml/styles-uit/Logs.qml
+++ b/interface/resources/qml/styles-uit/Logs.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 Logs {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/OverlayTitle.qml b/interface/resources/qml/styles-uit/OverlayTitle.qml
index ec9cf33482..51fc11a77d 100644
--- a/interface/resources/qml/styles-uit/OverlayTitle.qml
+++ b/interface/resources/qml/styles-uit/OverlayTitle.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 OverlayTitle {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/RalewayBold.qml b/interface/resources/qml/styles-uit/RalewayBold.qml
index 2370401ba2..1373859b32 100644
--- a/interface/resources/qml/styles-uit/RalewayBold.qml
+++ b/interface/resources/qml/styles-uit/RalewayBold.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 RalewayBold {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/RalewayLight.qml b/interface/resources/qml/styles-uit/RalewayLight.qml
index 0641a2746a..9573eb6649 100644
--- a/interface/resources/qml/styles-uit/RalewayLight.qml
+++ b/interface/resources/qml/styles-uit/RalewayLight.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 RalewayLight {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/RalewayRegular.qml b/interface/resources/qml/styles-uit/RalewayRegular.qml
index cf601f5c91..d5a66ff696 100644
--- a/interface/resources/qml/styles-uit/RalewayRegular.qml
+++ b/interface/resources/qml/styles-uit/RalewayRegular.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 RalewayRegular {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/RalewaySemiBold.qml b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
index a3c7cfe864..874a48555b 100644
--- a/interface/resources/qml/styles-uit/RalewaySemiBold.qml
+++ b/interface/resources/qml/styles-uit/RalewaySemiBold.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 RalewaySemiBold {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/SectionName.qml b/interface/resources/qml/styles-uit/SectionName.qml
index b3cb143988..819ed87d8b 100644
--- a/interface/resources/qml/styles-uit/SectionName.qml
+++ b/interface/resources/qml/styles-uit/SectionName.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 SectionName {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/Separator.qml b/interface/resources/qml/styles-uit/Separator.qml
index 9687fb0520..9708ec4c26 100644
--- a/interface/resources/qml/styles-uit/Separator.qml
+++ b/interface/resources/qml/styles-uit/Separator.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 Separator {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/ShortcutText.qml b/interface/resources/qml/styles-uit/ShortcutText.qml
index 921000651a..16e1b2f1c1 100644
--- a/interface/resources/qml/styles-uit/ShortcutText.qml
+++ b/interface/resources/qml/styles-uit/ShortcutText.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 ShortcutText {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/TabName.qml b/interface/resources/qml/styles-uit/TabName.qml
index 001c110a41..b66192e582 100644
--- a/interface/resources/qml/styles-uit/TabName.qml
+++ b/interface/resources/qml/styles-uit/TabName.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 TabName {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }
diff --git a/interface/resources/qml/styles-uit/TextFieldInput.qml b/interface/resources/qml/styles-uit/TextFieldInput.qml
index ce5bc9edbd..1498dde821 100644
--- a/interface/resources/qml/styles-uit/TextFieldInput.qml
+++ b/interface/resources/qml/styles-uit/TextFieldInput.qml
@@ -1,8 +1,4 @@
-import QtQuick 2.0
 import stylesUit 1.0
 
 TextFieldInput {
-    Component.onCompleted: {
-        console.warn("warning: including controls-uit is deprecated! please use 'import stylesUit 1.0' instead");
-    }
 }

From a3dfc873b7caa9471c330cf28784f7c2c545d55c Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Sat, 3 Nov 2018 11:06:21 +0530
Subject: [PATCH 72/73] rsolve rebase conflict

---
 interface/resources/qml/hifi/dialogs/security/Security.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/resources/qml/hifi/dialogs/security/Security.qml b/interface/resources/qml/hifi/dialogs/security/Security.qml
index 96a554838f..08605033a5 100644
--- a/interface/resources/qml/hifi/dialogs/security/Security.qml
+++ b/interface/resources/qml/hifi/dialogs/security/Security.qml
@@ -14,8 +14,8 @@
 import Hifi 1.0 as Hifi
 import QtQuick 2.5
 import QtGraphicalEffects 1.0
-import "qrc:////qml//styles-uit" as HifiStylesUit
-import "qrc:////qml//controls-uit" as HifiControlsUit
+import stylesUit 1.0 as HifiStylesUit
+import controlsUit 1.0 as as HifiControlsUit
 import "qrc:////qml//controls" as HifiControls
 import "qrc:////qml//hifi//commerce//common" as HifiCommerceCommon
 

From 1444b3a18668961a9cd4cc3fea57c0442bf21062 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Tue, 6 Nov 2018 09:57:51 -0800
Subject: [PATCH 73/73] resource mutex issues

(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
---
 libraries/networking/src/ResourceCache.cpp | 2 ++
 libraries/networking/src/ResourceCache.h   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 7aad8d468a..392bc5b7af 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -740,6 +740,8 @@ void Resource::handleReplyFinished() {
 
     setSize(_bytesTotal);
 
+    // Make sure we keep the Resource alive here
+    auto self = _self.lock();
     ResourceCache::requestCompleted(_self);
 
     auto result = _request->getResult();
diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h
index 33490301d7..c632399ad4 100644
--- a/libraries/networking/src/ResourceCache.h
+++ b/libraries/networking/src/ResourceCache.h
@@ -62,7 +62,7 @@ static const qint64 MAX_UNUSED_MAX_SIZE = MAXIMUM_CACHE_SIZE;
 class ResourceCacheSharedItems : public Dependency  {
     SINGLETON_DEPENDENCY
 
-    using Mutex = std::mutex;
+    using Mutex = std::recursive_mutex;
     using Lock = std::unique_lock<Mutex>;
 
 public: