diff --git a/libraries/shared/src/CPUID.cpp b/libraries/shared/src/CPUIdent.cpp
similarity index 98%
rename from libraries/shared/src/CPUID.cpp
rename to libraries/shared/src/CPUIdent.cpp
index e0eae248f3..2a367513b5 100644
--- a/libraries/shared/src/CPUID.cpp
+++ b/libraries/shared/src/CPUIdent.cpp
@@ -1,5 +1,5 @@
 //
-//  CPUID.cpp
+//  CPUIdent.cpp
 //
 //  Created by Ryan Huffman on 3/25/16.
 //  Copyright 2016 High Fidelity, Inc.
@@ -8,7 +8,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "CPUID.h"
+#include "CPUIdent.h"
 
 #ifdef Q_OS_WIN
 
@@ -72,4 +72,4 @@ std::vector<CPUID::Feature> CPUID::getAllFeatures() {
     return features;
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libraries/shared/src/CPUID.h b/libraries/shared/src/CPUIdent.h
similarity index 98%
rename from libraries/shared/src/CPUID.h
rename to libraries/shared/src/CPUIdent.h
index a8b8921d19..b8d39ac7b9 100644
--- a/libraries/shared/src/CPUID.h
+++ b/libraries/shared/src/CPUIdent.h
@@ -1,5 +1,5 @@
 //
-//  CPUID.h
+//  CPUIdent.h
 //
 //  Adapted from Microsoft's example for using the cpuid intrinsic,
 //  found at https://msdn.microsoft.com/en-us/library/hskdteyh.aspx
@@ -15,8 +15,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_CPUID_h
-#define hifi_CPUID_h
+#ifndef hifi_CPUIdent_h
+#define hifi_CPUIdent_h
 
 #include <QtCore/QtGlobal>
 
@@ -209,4 +209,4 @@ private:
 
 #endif
 
-#endif // hifi_CPUID_h
+#endif // hifi_CPUIdent_h
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 30d4726bcc..bdc5d4c60d 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #ifdef Q_OS_WIN
-#include "CPUID.h"
+#include "CPUIdent.h"
 #endif
 
 
@@ -758,10 +758,10 @@ void printSystemInformation() {
 
     qDebug() << "CPUID";
 
-    qDebug() << "\tCPU Vendor: " << CPUID::Vendor().c_str();
-    qDebug() << "\tCPU Brand:  " << CPUID::Brand().c_str();
+    qDebug() << "\tCPU Vendor: " << CPUIdent::Vendor().c_str();
+    qDebug() << "\tCPU Brand:  " << CPUIdent::Brand().c_str();
 
-    for (auto& feature : CPUID::getAllFeatures()) {
+    for (auto& feature : CPUIdent::getAllFeatures()) {
         qDebug().nospace().noquote() << "\t[" << (feature.supported ? "x" : " ") << "] " << feature.name.c_str();
     }
 #endif
@@ -777,4 +777,4 @@ void printSystemInformation() {
         qDebug().noquote().nospace() << "\t" <<
             (envVariables.contains(env) ? " = " + envVariables.value(env) : " NOT FOUND");
     }
-}
\ No newline at end of file
+}