diff --git a/CesiumGltf/include/CesiumGltf/AttributeSemantics.h b/CesiumGltf/include/CesiumGltf/VertexAttributeSemantics.h
similarity index 90%
rename from CesiumGltf/include/CesiumGltf/AttributeSemantics.h
rename to CesiumGltf/include/CesiumGltf/VertexAttributeSemantics.h
index 57195e707..03ea6a84f 100644
--- a/CesiumGltf/include/CesiumGltf/AttributeSemantics.h
+++ b/CesiumGltf/include/CesiumGltf/VertexAttributeSemantics.h
@@ -6,9 +6,9 @@
 namespace CesiumGltf {
 
 /**
- * @brief The standard glTF attribute semantics from the specification.
+ * @brief The standard glTF vertex attribute semantics from the specification.
  */
-struct AttributeSemantics {
+struct VertexAttributeSemantics {
   /**
    * @brief Unitless XYZ vertex positions.
    */
diff --git a/CesiumGltf/src/AttributeSemantics.cpp b/CesiumGltf/src/VertexAttributeSemantics.cpp
similarity index 68%
rename from CesiumGltf/src/AttributeSemantics.cpp
rename to CesiumGltf/src/VertexAttributeSemantics.cpp
index 5659c333e..932a3e002 100644
--- a/CesiumGltf/src/AttributeSemantics.cpp
+++ b/CesiumGltf/src/VertexAttributeSemantics.cpp
@@ -1,28 +1,28 @@
-#include <CesiumGltf/AttributeSemantics.h>
+#include <CesiumGltf/VertexAttributeSemantics.h>
 
 namespace CesiumGltf {
 
 /**
  * @brief Unitless XYZ vertex positions.
  */
-const std::string AttributeSemantics::POSITION = "POSITION";
+const std::string VertexAttributeSemantics::POSITION = "POSITION";
 
 /**
  * @brief Normalized XYZ vertex normals.
  */
-const std::string AttributeSemantics::NORMAL = "NORMAL";
+const std::string VertexAttributeSemantics::NORMAL = "NORMAL";
 
 /**
  * @brief XYZW vertex tangents where the XYZ portion is normalized, and the W
  * component is a sign value (-1 or +1) indicating handedness of the tangent
  * basis.
  */
-const std::string AttributeSemantics::TANGENT = "TANGENT";
+const std::string VertexAttributeSemantics::TANGENT = "TANGENT";
 
 /**
  * @brief ST texture coordinates
  */
-const std::array<std::string, 8> AttributeSemantics::TEXCOORD_n = {
+const std::array<std::string, 8> VertexAttributeSemantics::TEXCOORD_n = {
     "TEXCOORD_0",
     "TEXCOORD_1",
     "TEXCOORD_2",
@@ -35,7 +35,7 @@ const std::array<std::string, 8> AttributeSemantics::TEXCOORD_n = {
 /**
  * @brief RGB or RGBA vertex color linear multiplier.
  */
-const std::array<std::string, 8> AttributeSemantics::COLOR_n = {
+const std::array<std::string, 8> VertexAttributeSemantics::COLOR_n = {
     "COLOR_0",
     "COLOR_1",
     "COLOR_2",
@@ -49,7 +49,7 @@ const std::array<std::string, 8> AttributeSemantics::COLOR_n = {
  * @brief The indices of the joints from the corresponding skin.joints array
  * that affect the vertex.
  */
-const std::array<std::string, 8> AttributeSemantics::JOINTS_n = {
+const std::array<std::string, 8> VertexAttributeSemantics::JOINTS_n = {
     "JOINTS_0",
     "JOINTS_1",
     "JOINTS_2",
@@ -62,7 +62,7 @@ const std::array<std::string, 8> AttributeSemantics::JOINTS_n = {
 /**
  * @brief The weights indicating how strongly the joint influences the vertex.
  */
-const std::array<std::string, 8> AttributeSemantics::WEIGHTS_n = {
+const std::array<std::string, 8> VertexAttributeSemantics::WEIGHTS_n = {
     "WEIGHTS_0",
     "WEIGHTS_1",
     "WEIGHTS_2",