diff --git a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
index 8f381b732f3..895c8cd75cd 100644
--- a/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
+++ b/tensorflow/core/kernels/data/experimental/snapshot_dataset_op.cc
@@ -262,9 +262,11 @@ Status ReadMetadataFile(const string& hash_dir,
 Status DumpDatasetGraph(const std::string& path, uint64 hash,
                         const GraphDef& graph) {
   std::unique_ptr<WritableFile> file;
-  std::string graph_file = absl::StrCat(path, "/graph-", hash, ".pbtxt");
+  std::string hash_hex =
+      strings::StrCat(strings::Hex(hash, strings::kZeroPad16));
+  std::string graph_file = absl::StrCat(path, "/", hash_hex, "-graph.pbtxt");
 
-  LOG(INFO) << "Graph hash is " << hash << ", writing to " << graph_file;
+  LOG(INFO) << "Graph hash is " << hash_hex << ", writing to " << graph_file;
   TF_RETURN_IF_ERROR(Env::Default()->RecursivelyCreateDir(path));
   return WriteTextProto(Env::Default(), graph_file, graph);
 }
diff --git a/tensorflow/python/data/experimental/kernel_tests/snapshot_test.py b/tensorflow/python/data/experimental/kernel_tests/snapshot_test.py
index e42518a7c39..25af4c3b2af 100644
--- a/tensorflow/python/data/experimental/kernel_tests/snapshot_test.py
+++ b/tensorflow/python/data/experimental/kernel_tests/snapshot_test.py
@@ -62,7 +62,7 @@ class SnapshotDatasetTest(reader_dataset_ops_test_base.TFRecordDatasetTestBase,
 
     # Ignore the graphdef pbtxts we write for debugging purposes.
     for i in range(len(dirlist_raw)):
-      if not dirlist_raw[i].startswith("graph-"):
+      if not dirlist_raw[i].endswith("-graph.pbtxt"):
         dirlist.append(dirlist_raw[i])
 
     self.assertLen(dirlist, num_fingerprints)