diff --git a/tsl/profiler/lib/connected_traceme.h b/tsl/profiler/lib/connected_traceme.h
index c9e4e520c..bdaab43d4 100644
--- a/tsl/profiler/lib/connected_traceme.h
+++ b/tsl/profiler/lib/connected_traceme.h
@@ -81,7 +81,7 @@ class TraceMeProducer : public TraceMe {
   template <typename NameT>
   explicit TraceMeProducer(NameT&& name,
                            ContextType context_type = ContextType::kGeneric,
-                           std::optional<uint64> context_id = std::nullopt,
+                           std::optional<uint64_t> context_id = std::nullopt,
                            int level = tsl::profiler::TraceMeLevel::kCritical)
       : TraceMe(std::forward<NameT>(name), level),
         context_id_(context_id.has_value() ? context_id.value()
@@ -91,16 +91,16 @@ class TraceMeProducer : public TraceMe {
     });
   }
 
-  uint64 GetContextId() const { return context_id_; }
+  uint64_t GetContextId() const { return context_id_; }
 
  private:
-  uint64 context_id_;
+  uint64_t context_id_;
 };
 
 class TraceMeConsumer : public TraceMe {
  public:
   template <typename NameT>
-  TraceMeConsumer(NameT&& name, ContextType context_type, uint64 context_id,
+  TraceMeConsumer(NameT&& name, ContextType context_type, uint64_t context_id,
                   int level = tsl::profiler::TraceMeLevel::kCritical)
       : TraceMe(std::forward<NameT>(name), level) {
     AppendMetadata([&] {
@@ -109,7 +109,7 @@ class TraceMeConsumer : public TraceMe {
   }
 
   template <typename NameT>
-  TraceMeConsumer(NameT&& name, uint64 context_id, int level = 2)
+  TraceMeConsumer(NameT&& name, uint64_t context_id, int level = 2)
       : TraceMeConsumer(std::forward<NameT>(name), ContextType::kGeneric,
                         context_id, level) {}
 };
diff --git a/tsl/profiler/lib/profiler_session.h b/tsl/profiler/lib/profiler_session.h
index de1c782a7..6644017f5 100644
--- a/tsl/profiler/lib/profiler_session.h
+++ b/tsl/profiler/lib/profiler_session.h
@@ -83,8 +83,8 @@ class ProfilerSession {
 
   std::unique_ptr<profiler::ProfilerInterface> profilers_ TF_GUARDED_BY(mutex_);
 
-  uint64 start_time_ns_;
-  uint64 stop_time_ns_;
+  uint64_t start_time_ns_;
+  uint64_t stop_time_ns_;
   tensorflow::ProfileOptions options_;
 #endif
   absl::Status status_ TF_GUARDED_BY(mutex_);