diff --git a/htrace-c/src/CMakeLists.txt b/htrace-c/src/CMakeLists.txt
index 8c0d235..815962b 100644
--- a/htrace-c/src/CMakeLists.txt
+++ b/htrace-c/src/CMakeLists.txt
@@ -44,7 +44,7 @@
 CHECK_C_SOURCE_COMPILES("int main(void) { static __thread int i = 0; return 0; }" HAVE_IMPROVED_TLS)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/util/build.h.cmake ${CMAKE_BINARY_DIR}/util/build.h)
 
-get_filename_component(HTRACE_ABSPATH "../../htrace-htraced/go/build/htrace" ABSOLUTE)
+get_filename_component(HTRACED_TOOL_ABSPATH "../../htrace-htraced/go/build/htracedTool" ABSOLUTE)
 get_filename_component(HTRACED_ABSPATH "../../htrace-htraced/go/build/htraced" ABSOLUTE)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/test/test_config.h.cmake ${CMAKE_BINARY_DIR}/test/test_config.h)
 
diff --git a/htrace-c/src/test/htraced_rcv-unit.c b/htrace-c/src/test/htraced_rcv-unit.c
index d5c83ec..521a03d 100644
--- a/htrace-c/src/test/htraced_rcv-unit.c
+++ b/htrace-c/src/test/htraced_rcv-unit.c
@@ -66,7 +66,7 @@
     while (1) {
         int nspans;
 
-        // This uses the bin/htrace program to dump the spans to a json file.
+        // This uses the bin/htracedTool program to dump the spans to a json file.
         mini_htraced_dump_spans(ht, err, err_len, json_path);
         EXPECT_STR_EQ("", err);
         st = span_table_alloc();
diff --git a/htrace-c/src/test/mini_htraced.c b/htrace-c/src/test/mini_htraced.c
index 9a042fe..ba3f7a9 100644
--- a/htrace-c/src/test/mini_htraced.c
+++ b/htrace-c/src/test/mini_htraced.c
@@ -488,7 +488,7 @@
         return;
     }
     ht->num_htrace_commands_run++;
-    pid = mini_htraced_launch(ht, HTRACE_ABSPATH, err, err_len, 0,
+    pid = mini_htraced_launch(ht, HTRACED_TOOL_ABSPATH, err, err_len, 0,
                 addr, log_path, "dumpAll", path, NULL);
     free(addr);
     free(log_path);
@@ -501,7 +501,7 @@
     }
     if (ret != EXIT_SUCCESS) {
         snprintf(err, err_len, "%s returned non-zero exit status %d\n",
-                 HTRACE_ABSPATH, ret);
+                 HTRACED_TOOL_ABSPATH, ret);
         return;
     }
 }
diff --git a/htrace-c/src/test/test_config.h.cmake b/htrace-c/src/test/test_config.h.cmake
index 62b1744..8cfa4b6 100644
--- a/htrace-c/src/test/test_config.h.cmake
+++ b/htrace-c/src/test/test_config.h.cmake
@@ -19,8 +19,8 @@
 #ifndef APACHE_HTRACE_TEST_TEST_CONFIG_H
 #define APACHE_HTRACE_TEST_TEST_CONFIG_H
 
-// The absolute path to the htrace binary, for use in unit tests.
-#cmakedefine HTRACE_ABSPATH "@HTRACE_ABSPATH@"
+// The absolute path to the htracedTool binary, for use in unit tests.
+#cmakedefine HTRACED_TOOL_ABSPATH "@HTRACED_TOOL_ABSPATH@"
 
 // The absolute path to the htraced binary, for use in unit tests.
 #cmakedefine HTRACED_ABSPATH "@HTRACED_ABSPATH@"
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/cmd.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/cmd.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/cmd.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/cmd.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/file.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/file.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/file.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/file.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/file_test.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/file_test.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/file_test.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/graph.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/graph.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/graph.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/graph.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/graph_test.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/graph_test.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/graph_test.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/queries.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/queries.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/queries.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/queries.go
diff --git a/htrace-htraced/go/src/org/apache/htrace/htrace/query_test.go b/htrace-htraced/go/src/org/apache/htrace/htracedTool/query_test.go
similarity index 100%
rename from htrace-htraced/go/src/org/apache/htrace/htrace/query_test.go
rename to htrace-htraced/go/src/org/apache/htrace/htracedTool/query_test.go