diff --git a/tensorflow/cc/framework/cc_ops_test.cc b/tensorflow/cc/framework/cc_ops_test.cc
index ac05e3cf95b..178b4da972a 100644
--- a/tensorflow/cc/framework/cc_ops_test.cc
+++ b/tensorflow/cc/framework/cc_ops_test.cc
@@ -200,10 +200,10 @@ TEST(CCOpTest, TemplatedConst) {
   test::ExpectTensorEqual<float>(
       out, test::AsTensor<float>({3.f, 2.f, -1.f, 0.f}, {2, 2}));
 
-  auto c2 = ops::Const<string>(root, {{"this"}, {"is"}, {"a"}, {"constant"}});
+  auto c2 = ops::Const<tstring>(root, {{"this"}, {"is"}, {"a"}, {"constant"}});
   test::GetTensor(root, c2, &out);
-  test::ExpectTensorEqual<string>(
-      out, test::AsTensor<string>({"this", "is", "a", "constant"}, {4, 1}));
+  test::ExpectTensorEqual<tstring>(
+      out, test::AsTensor<tstring>({"this", "is", "a", "constant"}, {4, 1}));
 }
 
 TEST(CCOpTest, EmptyConst) {
diff --git a/tensorflow/cc/framework/ops.h b/tensorflow/cc/framework/ops.h
index 0717e7dd4b3..1414e861002 100644
--- a/tensorflow/cc/framework/ops.h
+++ b/tensorflow/cc/framework/ops.h
@@ -111,7 +111,7 @@ class Input {
     Initializer(const T& v) {  // NOLINT(runtime/explicit)
       typedef typename RealType<T>::type RealT;
       Tensor t(DataTypeToEnum<RealT>::v(), TensorShape());
-      t.flat<T>()(0) = RealT(v);
+      t.flat<RealT>()(0) = RealT(v);
       tensor = t;
     }
 
@@ -125,7 +125,7 @@ class Input {
       typedef typename RealType<T>::type RealT;
       Tensor t(DataTypeToEnum<RealT>::v(), shape);
       for (int64 i = 0; i < t.NumElements(); ++i) {
-        t.flat<T>()(i) = RealT(v);
+        t.flat<RealT>()(i) = RealT(v);
       }
       tensor = t;
     }
@@ -170,7 +170,7 @@ class Input {
     // START_SKIP_DOXYGEN
     template <typename T, bool = std::is_convertible<T, string>::value>
     struct RealType {
-      typedef string type;
+      typedef tstring type;
     };
 
     template <typename T>
diff --git a/tensorflow/cc/ops/const_op_test.cc b/tensorflow/cc/ops/const_op_test.cc
index 69b5d7fd47c..345cd23b9ec 100644
--- a/tensorflow/cc/ops/const_op_test.cc
+++ b/tensorflow/cc/ops/const_op_test.cc
@@ -97,7 +97,7 @@ TEST(ConstOpTest, WithExplicitShape) {
   auto d = ops::Const(root, {"1", "2", "3", "4", "5", "6"}, {2, 3});
   TF_CHECK_OK(root.status());
   EXPECT_EQ(d.op().output_type(0), DT_STRING);
-  ExpectNodeEqual<string>(d.node(), {"1", "2", "3", "4", "5", "6"}, {2, 3});
+  ExpectNodeEqual<tstring>(d.node(), {"1", "2", "3", "4", "5", "6"}, {2, 3});
 }
 
 TEST(ConstOpTest, FromProto) {
@@ -144,7 +144,7 @@ TEST(ConstOpTest, TemplatedConst) {
   auto c1 = ops::Const<int>(root, {1, 2});
   ExpectTypeAndShape(c1.node(), DT_INT32, {2});
 
-  auto c2 = ops::Const<string>(root, {{"this"}, {"is"}, {"a"}, {"constant"}});
+  auto c2 = ops::Const<tstring>(root, {{"this"}, {"is"}, {"a"}, {"constant"}});
   ExpectTypeAndShape(c2.node(), DT_STRING, {4, 1});
 }
 
diff --git a/tensorflow/cc/saved_model/loader_test.cc b/tensorflow/cc/saved_model/loader_test.cc
index 422994ba07c..aa2031d17d2 100644
--- a/tensorflow/cc/saved_model/loader_test.cc
+++ b/tensorflow/cc/saved_model/loader_test.cc
@@ -63,8 +63,8 @@ class LoaderTest : public ::testing::Test {
         bundle.session->Run({}, {"filename_tensor:0"}, {}, &path_outputs));
     ASSERT_EQ(1, path_outputs.size());
 
-    test::ExpectTensorEqual<string>(
-        test::AsTensor<string>({"foo.txt"}, TensorShape({})), path_outputs[0]);
+    test::ExpectTensorEqual<tstring>(
+        test::AsTensor<tstring>({"foo.txt"}, TensorShape({})), path_outputs[0]);
   }
 
   void CheckSavedModelBundle(const string& export_dir,
@@ -78,14 +78,14 @@ class LoaderTest : public ::testing::Test {
     const string output_name =
         signature_def.outputs().at(kRegressOutputs).name();
 
-    std::vector<string> serialized_examples;
+    std::vector<tstring> serialized_examples;
     for (float x : {0, 1, 2, 3}) {
       serialized_examples.push_back(MakeSerializedExample(x));
     }
 
     // Validate the half plus two behavior.
     Tensor input =
-        test::AsTensor<string>(serialized_examples, TensorShape({4}));
+        test::AsTensor<tstring>(serialized_examples, TensorShape({4}));
     std::vector<Tensor> outputs;
     TF_ASSERT_OK(bundle.session->Run({{input_name, input}}, {output_name}, {},
                                      &outputs));