diff --git a/tensorflow/c/experimental/saved_model/core/concrete_function.cc b/tensorflow/c/experimental/saved_model/core/concrete_function.cc
index e6e7a5118d7..d5da2ca9bf4 100644
--- a/tensorflow/c/experimental/saved_model/core/concrete_function.cc
+++ b/tensorflow/c/experimental/saved_model/core/concrete_function.cc
@@ -21,7 +21,7 @@ limitations under the License.
 namespace tensorflow {
 
 const std::vector<tensorflow::AbstractTensorHandleInterface*>&
-ConcreteFunction::Captures() const {
+ConcreteFunction::GetCaptures() const {
   return captures_;
 }
 
diff --git a/tensorflow/c/experimental/saved_model/core/concrete_function.h b/tensorflow/c/experimental/saved_model/core/concrete_function.h
index e4b8cf6c975..6f8a5375277 100644
--- a/tensorflow/c/experimental/saved_model/core/concrete_function.h
+++ b/tensorflow/c/experimental/saved_model/core/concrete_function.h
@@ -38,9 +38,9 @@ class ConcreteFunction {
   virtual ~ConcreteFunction() = 0;
 
   // This method returns the "Call" Op used to execute the function.
-  virtual AbstractOperationInterface* GetFunctionOp() = 0;
+  virtual AbstractOperationInterface* GetCallOp() = 0;
 
-  const std::vector<tensorflow::AbstractTensorHandleInterface*>& Captures()
+  const std::vector<tensorflow::AbstractTensorHandleInterface*>& GetCaptures()
       const;
   const FunctionMetadata& GetFunctionMetadata() const;
 
diff --git a/tensorflow/c/experimental/saved_model/internal/concrete_function.cc b/tensorflow/c/experimental/saved_model/internal/concrete_function.cc
index 69f9c2cc609..da964900420 100644
--- a/tensorflow/c/experimental/saved_model/internal/concrete_function.cc
+++ b/tensorflow/c/experimental/saved_model/internal/concrete_function.cc
@@ -33,8 +33,8 @@ TF_OutputList* TF_ConcreteFunctionGetCaptures(TF_ConcreteFunction* func) {
   return nullptr;
 }
 
-TFE_Op* TF_ConcreteFunctionGetOperation(TF_ConcreteFunction* func) {
-  return new TFE_Op{tensorflow::unwrap(func)->GetFunctionOp()};
+TFE_Op* TF_ConcreteFunctionGetCallOp(TF_ConcreteFunction* func) {
+  return new TFE_Op{tensorflow::unwrap(func)->GetCallOp()};
 }
 
 }  // end extern "C"
diff --git a/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc b/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc
index 711454a6a3b..009d6119dc3 100644
--- a/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc
+++ b/tensorflow/c/experimental/saved_model/internal/saved_model_api.cc
@@ -35,9 +35,9 @@ TF_SavedModel* TF_LoadSavedModel(const char* dirname, TFE_Context* ctx,
 
 void TF_DeleteSavedModel(TF_SavedModel* model) { delete model; }
 
-TF_ConcreteFunction* TF_GetSavedModelFunction(TF_SavedModel* model,
-                                              char* function_path,
-                                              TF_Status* status) {
+TF_ConcreteFunction* TF_GetSavedModelConcreteFunction(TF_SavedModel* model,
+                                                      char* function_path,
+                                                      TF_Status* status) {
   tensorflow::ConcreteFunction* result = nullptr;
   tensorflow::Status get_function_status =
       model->saved_model->GetFunction(function_path, &result);
diff --git a/tensorflow/c/experimental/saved_model/public/concrete_function.h b/tensorflow/c/experimental/saved_model/public/concrete_function.h
index b4cd63c7a67..5baac904292 100644
--- a/tensorflow/c/experimental/saved_model/public/concrete_function.h
+++ b/tensorflow/c/experimental/saved_model/public/concrete_function.h
@@ -40,7 +40,7 @@ TF_CAPI_EXPORT extern TF_OutputList* TF_ConcreteFunctionGetCaptures(
     TF_ConcreteFunction* func);
 
 // Returns a TFE_Op suitable for executing this function.
-TF_CAPI_EXPORT extern TFE_Op* TF_ConcreteFunctionGetOperation(
+TF_CAPI_EXPORT extern TFE_Op* TF_ConcreteFunctionGetCallOp(
     TF_ConcreteFunction* func);
 
 // Deletes `func`.
diff --git a/tensorflow/c/experimental/saved_model/public/saved_model_api.h b/tensorflow/c/experimental/saved_model/public/saved_model_api.h
index 0610f8d24a9..fa0976d3310 100644
--- a/tensorflow/c/experimental/saved_model/public/saved_model_api.h
+++ b/tensorflow/c/experimental/saved_model/public/saved_model_api.h
@@ -67,7 +67,7 @@ TF_CAPI_EXPORT extern void TF_DeleteSavedModel(TF_SavedModel* model);
 //  TF_ConcreteFunction instance. The lifetime of this instance is
 //  "conceptually" bound to `model`. Once `model` is deleted, all
 //  `TF_ConcreteFunctions` retrieved from it are invalid, and have been deleted.
-TF_CAPI_EXPORT extern TF_ConcreteFunction* TF_GetSavedModelFunction(
+TF_CAPI_EXPORT extern TF_ConcreteFunction* TF_GetSavedModelConcreteFunction(
     TF_SavedModel* model, char* function_path, TF_Status* status);
 
 // Retrieve a function from the TF SavedModel via a SignatureDef key.