diff --git a/src/mxfeatures.cc b/src/mxfeatures.cc
index 705de1e50142..a9f209b331ae 100644
--- a/src/mxfeatures.cc
+++ b/src/mxfeatures.cc
@@ -32,9 +32,9 @@ namespace mxnet {
 namespace features {
 
 
-class Storage {
+class FeatureSet {
  public:
-    Storage():
+    FeatureSet():
         feature_bits() {
         // GPU
         feature_bits.set(CUDA, MXNET_USE_CUDA);
@@ -105,7 +105,7 @@ class Storage {
     std::bitset<MAX_FEATURES> feature_bits;
 };
 
-static Storage storage;
+static FeatureSet storage;
 
 bool is_enabled(const unsigned feat) {
     return storage.is_enabled(feat);