diff --git a/assignment-client/src/AssignmentClientApp.cpp b/assignment-client/src/AssignmentClientApp.cpp
index cd46731acc..daa3896505 100644
--- a/assignment-client/src/AssignmentClientApp.cpp
+++ b/assignment-client/src/AssignmentClientApp.cpp
@@ -12,7 +12,6 @@
 #include <QCommandLineParser>
 #include <QThread>
 
-#include <BuildInfo.h>
 #include <LogHandler.h>
 #include <SharedUtil.h>
 #include <HifiConfigVariantMap.h>
@@ -40,11 +39,6 @@ AssignmentClientApp::AssignmentClientApp(int argc, char* argv[]) :
     ShutdownEventListener::getInstance();
 #   endif
 
-    setApplicationName(BuildInfo::ASSIGNMENT_CLIENT_NAME);
-    setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
-    setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
-    setApplicationVersion(BuildInfo::VERSION);
-
     // use the verbose message handler in Logging
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
 
diff --git a/assignment-client/src/main.cpp b/assignment-client/src/main.cpp
index 052c4755f8..98810e2ce1 100644
--- a/assignment-client/src/main.cpp
+++ b/assignment-client/src/main.cpp
@@ -14,10 +14,16 @@
 #include <SharedUtil.h>
 
 #include "AssignmentClientApp.h"
+#include <BuildInfo.h>
 
 int main(int argc, char* argv[]) {
     disableQtBearerPoll(); // Fixes wifi ping spikes
 
+    QCoreApplication::setApplicationName(BuildInfo::ASSIGNMENT_CLIENT_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+    
     AssignmentClientApp app(argc, argv);
     
     int acReturn = app.exec();
diff --git a/cmake/templates/BuildInfo.h.in b/cmake/templates/BuildInfo.h.in
index 579f2dc1d7..b0af1c0524 100644
--- a/cmake/templates/BuildInfo.h.in
+++ b/cmake/templates/BuildInfo.h.in
@@ -20,6 +20,7 @@ namespace BuildInfo {
     const QString INTERFACE_NAME = "Interface";
     const QString ASSIGNMENT_CLIENT_NAME = "assignment-client";
     const QString DOMAIN_SERVER_NAME = "domain-server";
+    const QString AC_CLIENT_SERVER_NAME = "ac-client";
     const QString MODIFIED_ORGANIZATION = "@BUILD_ORGANIZATION@";
     const QString ORGANIZATION_DOMAIN = "highfidelity.io";
     const QString VERSION = "@BUILD_VERSION@";
diff --git a/libraries/shared/src/SettingHelpers.h b/libraries/shared/src/SettingHelpers.h
index c2f270f5b5..122e56957c 100644
--- a/libraries/shared/src/SettingHelpers.h
+++ b/libraries/shared/src/SettingHelpers.h
@@ -12,17 +12,7 @@
 #ifndef hifi_SettingHelpers_h
 #define hifi_SettingHelpers_h
 
-
-
-
 #include <QSettings>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QRect>
-#include <QSize>
-#include <QPoint>
-#include <QDataStream>
-#include <QStringList>
 
 bool readJSONFile(QIODevice& device, QSettings::SettingsMap& map);
 bool writeJSONFile(QIODevice& device, const QSettings::SettingsMap& map);
diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp
index dad0a6d617..4c12a09388 100644
--- a/tools/ac-client/src/ACClientApp.cpp
+++ b/tools/ac-client/src/ACClientApp.cpp
@@ -81,9 +81,8 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
         listenPort = parser.value(listenPortOption).toInt();
     }
 
-    Setting::preInit();
-    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
     Setting::init();
+    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
 
     DependencyManager::set<AccountManager>([&]{ return QString("Mozilla/5.0 (HighFidelityACClient)"); });
     DependencyManager::set<AddressManager>();
diff --git a/tools/ac-client/src/main.cpp b/tools/ac-client/src/main.cpp
index 918df6413f..12c5e6f5f8 100644
--- a/tools/ac-client/src/main.cpp
+++ b/tools/ac-client/src/main.cpp
@@ -13,11 +13,19 @@
 #include <string>
 #include <vector>
 
+#include <BuildInfo.h>
+
 #include "ACClientApp.h"
 
 using namespace std;
 
 int main(int argc, char * argv[]) {
+    QCoreApplication::setApplicationName(BuildInfo::AC_CLIENT_SERVER_NAME);
+    QCoreApplication::setOrganizationName(BuildInfo::MODIFIED_ORGANIZATION);
+    QCoreApplication::setOrganizationDomain(BuildInfo::ORGANIZATION_DOMAIN);
+    QCoreApplication::setApplicationVersion(BuildInfo::VERSION);
+
     ACClientApp app(argc, argv);
+
     return app.exec();
 }