5 files changed, 23 insertions, 27 deletions
diff --git a/src/buildtool/serve_api/remote/TARGETS b/src/buildtool/serve_api/remote/TARGETS
index 45114f57..9b038440 100644
--- a/src/buildtool/serve_api/remote/TARGETS
+++ b/src/buildtool/serve_api/remote/TARGETS
@@ -5,11 +5,11 @@
   , "deps": [["src/buildtool/common/remote", "remote_common"]]
   , "stage": ["src", "buildtool", "serve_api", "remote"]
   }
-, "serve_target_level_cache_client":
+, "source_tree_client":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["serve_target_level_cache_client"]
-  , "hdrs": ["serve_target_level_cache_client.hpp"]
-  , "srcs": ["serve_target_level_cache_client.cpp"]
+  , "name": ["source_tree_client"]
+  , "hdrs": ["source_tree_client.hpp"]
+  , "srcs": ["source_tree_client.cpp"]
   , "deps":
     [ ["src/buildtool/common/remote", "port"]
     , ["src/buildtool/logging", "logging"]
@@ -23,10 +23,7 @@
   , "name": ["serve_api"]
   , "hdrs": ["serve_api.hpp"]
   , "srcs": ["serve_api.cpp"]
-  , "deps":
-    [ ["src/buildtool/common/remote", "port"]
-    , "serve_target_level_cache_client"
-    ]
+  , "deps": [["src/buildtool/common/remote", "port"], "source_tree_client"]
   , "stage": ["src", "buildtool", "serve_api", "remote"]
   }
 }
diff --git a/src/buildtool/serve_api/remote/serve_api.cpp b/src/buildtool/serve_api/remote/serve_api.cpp
index 7b57d7d0..0b0493d7 100644
--- a/src/buildtool/serve_api/remote/serve_api.cpp
+++ b/src/buildtool/serve_api/remote/serve_api.cpp
@@ -15,7 +15,7 @@
 #include "src/buildtool/serve_api/remote/serve_api.hpp"
 
 ServeApi::ServeApi(std::string const& host, Port port) noexcept
-    : tlc_{std::make_unique<ServeTargetLevelCacheClient>(host, port)} {}
+    : stc_{std::make_unique<SourceTreeClient>(host, port)} {}
 
 // implement move constructor in cpp, where all members are complete types
 ServeApi::ServeApi(ServeApi&& other) noexcept = default;
@@ -27,5 +27,5 @@ auto ServeApi::RetrieveTreeFromCommit(std::string const& commit,
                                       std::string const& subdir,
                                       bool sync_tree)
     -> std::optional<std::string> {
-    return tlc_->ServeCommitTree(commit, subdir, sync_tree);
+    return stc_->ServeCommitTree(commit, subdir, sync_tree);
 }
diff --git a/src/buildtool/serve_api/remote/serve_api.hpp b/src/buildtool/serve_api/remote/serve_api.hpp
index d3fc29d1..d206b416 100644
--- a/src/buildtool/serve_api/remote/serve_api.hpp
+++ b/src/buildtool/serve_api/remote/serve_api.hpp
@@ -20,7 +20,7 @@
 #include <string>
 
 #include "src/buildtool/common/remote/port.hpp"
-#include "src/buildtool/serve_api/remote/serve_target_level_cache_client.hpp"
+#include "src/buildtool/serve_api/remote/source_tree_client.hpp"
 
 class ServeApi final {
   public:
@@ -42,8 +42,8 @@ class ServeApi final {
         -> std::optional<std::string>;
 
   private:
-    // target-level cache service client
-    std::unique_ptr<ServeTargetLevelCacheClient> tlc_;
+    // source tree service client
+    std::unique_ptr<SourceTreeClient> stc_;
 };
 
 #endif  // INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_API_HPP
diff --git a/src/buildtool/serve_api/remote/serve_target_level_cache_client.cpp b/src/buildtool/serve_api/remote/source_tree_client.cpp
index b414b7ac..2026d80d 100644
--- a/src/buildtool/serve_api/remote/serve_target_level_cache_client.cpp
+++ b/src/buildtool/serve_api/remote/source_tree_client.cpp
@@ -12,20 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/buildtool/serve_api/remote/serve_target_level_cache_client.hpp"
+#include "src/buildtool/serve_api/remote/source_tree_client.hpp"
 
 #include "src/buildtool/common/remote/client_common.hpp"
 
-ServeTargetLevelCacheClient::ServeTargetLevelCacheClient(
-    std::string const& server,
-    Port port) noexcept {
+SourceTreeClient::SourceTreeClient(std::string const& server,
+                                   Port port) noexcept {
     stub_ = justbuild::just_serve::SourceTree::NewStub(
         CreateChannelWithCredentials(server, port));
 }
 
-auto ServeTargetLevelCacheClient::ServeCommitTree(std::string const& commit_id,
-                                                  std::string const& subdir,
-                                                  bool sync_tree)
+auto SourceTreeClient::ServeCommitTree(std::string const& commit_id,
+                                       std::string const& subdir,
+                                       bool sync_tree)
     -> std::optional<std::string> {
     justbuild::just_serve::ServeCommitTreeRequest request{};
     request.set_commit(commit_id);
diff --git a/src/buildtool/serve_api/remote/serve_target_level_cache_client.hpp b/src/buildtool/serve_api/remote/source_tree_client.hpp
index 551759cb..1b557163 100644
--- a/src/buildtool/serve_api/remote/serve_target_level_cache_client.hpp
+++ b/src/buildtool/serve_api/remote/source_tree_client.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_TLC_CLIENT_HPP
-#define INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_TLC_CLIENT_HPP
+#ifndef INCLUDED_SRC_BUILDTOOL_SERVE_API_SOURCE_TREE_CLIENT_HPP
+#define INCLUDED_SRC_BUILDTOOL_SERVE_API_SOURCE_TREE_CLIENT_HPP
 
 #include <memory>
 #include <string>
@@ -22,11 +22,11 @@
 #include "src/buildtool/common/remote/port.hpp"
 #include "src/buildtool/logging/logger.hpp"
 
-/// Implements client side for service defined in:
+/// Implements client side for SourceTree service defined in:
 /// src/buildtool/serve_api/serve_service/just_serve.proto
-class ServeTargetLevelCacheClient {
+class SourceTreeClient {
   public:
-    ServeTargetLevelCacheClient(std::string const& server, Port port) noexcept;
+    SourceTreeClient(std::string const& server, Port port) noexcept;
 
     /// \brief Retrieve the Git tree of a given commit, if known by the remote.
     /// \param[in] commit_id Hash of the Git commit to look up.
@@ -40,7 +40,7 @@ class ServeTargetLevelCacheClient {
 
   private:
     std::unique_ptr<justbuild::just_serve::SourceTree::Stub> stub_;
-    Logger logger_{"RemoteTLCClient"};
+    Logger logger_{"RemoteSourceTreeClient"};
 };
 
-#endif  // INCLUDED_SRC_BUILDTOOL_SERVE_API_REMOTE_SERVE_TLC_CLIENT_HPP
+#endif  // INCLUDED_SRC_BUILDTOOL_SERVE_API_SOURCE_TREE_CLIENT_HPP