5 files changed, 13 insertions, 13 deletions
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 2687aec7..c6fa78b9 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -12,7 +12,7 @@
     ]
   , "srcs": ["tree_reader_utils.cpp"]
   , "deps":
-    [ "artifact_blob_container"
+    [ "artifact_blob"
     , ["@", "fmt", "", "fmt"]
     , ["@", "gsl", "", "gsl"]
     , ["@", "protoc", "", "libprotobuf"]
@@ -90,7 +90,7 @@
   , "hdrs": ["common_api.hpp"]
   , "srcs": ["common_api.cpp"]
   , "deps":
-    [ "artifact_blob_container"
+    [ "artifact_blob"
     , "blob_tree"
     , "common"
     , ["@", "gsl", "", "gsl"]
@@ -104,8 +104,8 @@
     [ "content_blob_container"
     , "message_limits"
     , ["@", "fmt", "", "fmt"]
-    , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/logging", "log_level"]
     ]
   }
 , "blob_tree":
@@ -114,7 +114,7 @@
   , "hdrs": ["blob_tree.hpp"]
   , "srcs": ["blob_tree.cpp"]
   , "deps":
-    [ "artifact_blob_container"
+    [ "artifact_blob"
     , ["@", "gsl", "", "gsl"]
     , ["src/buildtool/execution_api/bazel_msg", "directory_tree"]
     ]
@@ -136,10 +136,10 @@
   , "deps": [["@", "gsl", "", "gsl"], ["src/utils/cpp", "hash_combine"]]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
-, "artifact_blob_container":
+, "artifact_blob":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["artifact_blob_container"]
-  , "hdrs": ["artifact_blob_container.hpp"]
+  , "name": ["artifact_blob"]
+  , "hdrs": ["artifact_blob.hpp"]
   , "deps": ["content_blob_container", ["src/buildtool/common", "common"]]
   , "stage": ["src", "buildtool", "execution_api", "common"]
   }
diff --git a/src/buildtool/execution_api/common/artifact_blob_container.hpp b/src/buildtool/execution_api/common/artifact_blob.hpp
index 7aea21ab..5e113123 100644
--- a/src/buildtool/execution_api/common/artifact_blob_container.hpp
+++ b/src/buildtool/execution_api/common/artifact_blob.hpp
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_CONTAINER_HPP
-#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_CONTAINER_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_HPP
+#define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_HPP
 
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/execution_api/common/content_blob_container.hpp"
 
 using ArtifactBlob = ContentBlob<ArtifactDigest>;
 
-#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_CONTAINER_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_EXECUTION_API_COMMON_ARTIFACT_BLOB_HPP
diff --git a/src/buildtool/execution_api/common/blob_tree.hpp b/src/buildtool/execution_api/common/blob_tree.hpp
index 4b2bde01..d8fc7c1d 100644
--- a/src/buildtool/execution_api/common/blob_tree.hpp
+++ b/src/buildtool/execution_api/common/blob_tree.hpp
@@ -24,7 +24,7 @@
 #include "gsl/gsl"
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp"
-#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob.hpp"
 
 class BlobTree;
 using BlobTreePtr = gsl::not_null<std::shared_ptr<BlobTree>>;
diff --git a/src/buildtool/execution_api/common/common_api.hpp b/src/buildtool/execution_api/common/common_api.hpp
index 04997b5f..05cb46fd 100644
--- a/src/buildtool/execution_api/common/common_api.hpp
+++ b/src/buildtool/execution_api/common/common_api.hpp
@@ -28,7 +28,7 @@
 #include "src/buildtool/common/artifact_digest.hpp"
 #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp"
 #include "src/buildtool/execution_api/bazel_msg/directory_tree.hpp"
-#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob.hpp"
 #include "src/buildtool/execution_api/common/blob_tree.hpp"
 #include "src/buildtool/execution_api/common/execution_api.hpp"
 #include "src/buildtool/logging/logger.hpp"
diff --git a/src/buildtool/execution_api/common/execution_api.hpp b/src/buildtool/execution_api/common/execution_api.hpp
index 1d4f0d5d..1a2a0771 100644
--- a/src/buildtool/execution_api/common/execution_api.hpp
+++ b/src/buildtool/execution_api/common/execution_api.hpp
@@ -26,7 +26,7 @@
 
 #include "src/buildtool/common/artifact.hpp"  // Artifact::ObjectInfo
 #include "src/buildtool/common/artifact_digest.hpp"
-#include "src/buildtool/execution_api/common/artifact_blob_container.hpp"
+#include "src/buildtool/execution_api/common/artifact_blob.hpp"
 #include "src/buildtool/execution_api/common/execution_action.hpp"
 #include "src/buildtool/execution_engine/dag/dag.hpp"