Nitpicking on the correct name maybe...

libraries/render/src/render/Scene.h

@@ -14,7 +14,7 @@
 
 #include "Item.h"
 #include "SpatialTree.h"
-#include "Tag.h"
+#include "Selection.h"
 
 namespace render {
 
@@ -116,9 +116,9 @@ protected:
     void updateItems(const ItemIDs& ids, UpdateFunctors& functors);
 
 
-    // The Tag map
-    std::mutex _tagsMutex;
-    TagMap _tags;
+    // The Selection map
+    std::mutex _selectionsMutex;
+    SelectionMap _selections;
 
     friend class Engine;
 };

libraries/render/src/render/Selection.cpp

@@ -1,5 +1,5 @@
 //
-//  Tag.cpp
+//  Selection.cpp
 //  render/src/render
 //
 //  Created by Sam Gateau on 4/4/2017.
@@ -8,20 +8,20 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-#include "Tag.h"
+#include "Selection.h"
 
 #include "Logging.h"
 
 using namespace render;
 
-Tag::Tag(const std::string& name, const ItemIDs items) : 
+Selection::Selection(const std::string& name, const ItemIDs items) :
     _name(name),
     _items(items)
 {
 
 }
 
-Tag::~Tag() {
+Selection::~Selection() {
 
 }
 

libraries/render/src/render/Selection.h

@@ -1,5 +1,5 @@
 //
-//  Tag.h
+//  Selection.h
 //  render/src/render
 //
 //  Created by Sam Gateau on 4/4/2017.
@@ -9,18 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_render_Tag_h
-#define hifi_render_Tag_h
+#ifndef hifi_render_Selection_h
+#define hifi_render_Selection_h
 
 #include "Item.h"
 
 namespace render {
 
-    class Tag {
+    class Selection {
     public:
 
-        Tag(const std::string& name, const ItemIDs items);
-        ~Tag();
+        Selection(const std::string& name, const ItemIDs items);
+        ~Selection();
 
         const std::string& getName() const { return _name; }
 
@@ -30,20 +30,10 @@ namespace render {
         const std::string _name;
         ItemIDs _items;
     };
-    using Tags = std::vector<Tag>;
+    using Selections = std::vector<Selection>;
 
-    class TagMap {
-    public:
-        using NameMap = std::map<std::string, uint32_t>;
+    using SelectionMap = std::map<std::string, Selection>;
 
-        TagMap() {}
-        ~TagMap() {}
-
-
-    protected:
-        NameMap _names;
-        Tags _values;
-    };
 }
 
 #endif