diff --git a/src/code-factory.cc b/src/code-factory.cc
index e9a007b63d..9c29f8e664 100644
--- a/src/code-factory.cc
+++ b/src/code-factory.cc
@@ -23,7 +23,7 @@ Callable make_callable(Stub& stub) {
 
 // static
 Callable CodeFactory::LoadIC(Isolate* isolate) {
-  LoadICTrampolineTFStub stub(isolate);
+  LoadICTrampolineStub stub(isolate);
   return make_callable(stub);
 }
 
@@ -35,7 +35,7 @@ Callable CodeFactory::ApiGetter(Isolate* isolate) {
 
 // static
 Callable CodeFactory::LoadICInOptimizedCode(Isolate* isolate) {
-  LoadICTFStub stub(isolate);
+  LoadICStub stub(isolate);
   return make_callable(stub);
 }
 
diff --git a/src/code-stubs.cc b/src/code-stubs.cc
index b4bbf5a1f8..4d5dd84692 100644
--- a/src/code-stubs.cc
+++ b/src/code-stubs.cc
@@ -419,7 +419,7 @@ Handle<Code> TurboFanCodeStub::GenerateCode() {
   return assembler.GenerateCode();
 }
 
-void LoadICTrampolineTFStub::GenerateAssembly(
+void LoadICTrampolineStub::GenerateAssembly(
     CodeStubAssembler* assembler) const {
   typedef compiler::Node Node;
 
@@ -433,7 +433,7 @@ void LoadICTrampolineTFStub::GenerateAssembly(
   assembler->LoadIC(&p);
 }
 
-void LoadICTFStub::GenerateAssembly(CodeStubAssembler* assembler) const {
+void LoadICStub::GenerateAssembly(CodeStubAssembler* assembler) const {
   typedef compiler::Node Node;
 
   Node* receiver = assembler->Parameter(Descriptor::kReceiver);
diff --git a/src/code-stubs.h b/src/code-stubs.h
index 8e91bc6d9a..a3fa43840c 100644
--- a/src/code-stubs.h
+++ b/src/code-stubs.h
@@ -126,7 +126,7 @@ class ObjectLiteral;
   V(StoreScriptContextField)                  \
   V(NumberToString)                           \
   V(GetProperty)                              \
-  V(LoadICTF)                                 \
+  V(LoadIC)                                   \
   V(KeyedLoadICTF)                            \
   V(StoreFastElement)                         \
   V(StoreField)                               \
@@ -141,7 +141,7 @@ class ObjectLiteral;
   /* These are only called from FGC and */    \
   /* can be removed when we use ignition */   \
   /* only */                                  \
-  V(LoadICTrampolineTF)                       \
+  V(LoadICTrampoline)                         \
   V(LoadGlobalICTrampoline)                   \
   V(KeyedLoadICTrampolineTF)                  \
   V(StoreICTrampolineTF)
@@ -2035,18 +2035,16 @@ class KeyedLoadGenericStub : public HydrogenCodeStub {
   DEFINE_HYDROGEN_CODE_STUB(KeyedLoadGeneric, HydrogenCodeStub);
 };
 
-
-class LoadICTrampolineTFStub : public TurboFanCodeStub {
+class LoadICTrampolineStub : public TurboFanCodeStub {
  public:
-  explicit LoadICTrampolineTFStub(Isolate* isolate)
-      : TurboFanCodeStub(isolate) {}
+  explicit LoadICTrampolineStub(Isolate* isolate) : TurboFanCodeStub(isolate) {}
 
   void GenerateAssembly(CodeStubAssembler* assembler) const override;
 
   Code::Kind GetCodeKind() const override { return Code::LOAD_IC; }
 
   DEFINE_CALL_INTERFACE_DESCRIPTOR(Load);
-  DEFINE_CODE_STUB(LoadICTrampolineTF, TurboFanCodeStub);
+  DEFINE_CODE_STUB(LoadICTrampoline, TurboFanCodeStub);
 };
 
 class LoadGlobalICTrampolineStub : public TurboFanCodeStub {
@@ -2080,16 +2078,16 @@ class KeyedLoadICTrampolineStub : public PlatformCodeStub {
   DEFINE_PLATFORM_CODE_STUB(KeyedLoadICTrampoline, PlatformCodeStub);
 };
 
-class KeyedLoadICTrampolineTFStub : public LoadICTrampolineTFStub {
+class KeyedLoadICTrampolineTFStub : public LoadICTrampolineStub {
  public:
   explicit KeyedLoadICTrampolineTFStub(Isolate* isolate)
-      : LoadICTrampolineTFStub(isolate) {}
+      : LoadICTrampolineStub(isolate) {}
 
   void GenerateAssembly(CodeStubAssembler* assembler) const override;
 
   Code::Kind GetCodeKind() const override { return Code::KEYED_LOAD_IC; }
 
-  DEFINE_CODE_STUB(KeyedLoadICTrampolineTF, LoadICTrampolineTFStub);
+  DEFINE_CODE_STUB(KeyedLoadICTrampolineTF, LoadICTrampolineStub);
 };
 
 class StoreICTrampolineStub : public PlatformCodeStub {
@@ -2167,16 +2165,16 @@ class CallICTrampolineStub : public PlatformCodeStub {
   DEFINE_PLATFORM_CODE_STUB(CallICTrampoline, PlatformCodeStub);
 };
 
-class LoadICTFStub : public TurboFanCodeStub {
+class LoadICStub : public TurboFanCodeStub {
  public:
-  explicit LoadICTFStub(Isolate* isolate) : TurboFanCodeStub(isolate) {}
+  explicit LoadICStub(Isolate* isolate) : TurboFanCodeStub(isolate) {}
 
   void GenerateAssembly(CodeStubAssembler* assembler) const override;
 
   Code::Kind GetCodeKind() const override { return Code::LOAD_IC; }
 
   DEFINE_CALL_INTERFACE_DESCRIPTOR(LoadWithVector);
-  DEFINE_CODE_STUB(LoadICTF, TurboFanCodeStub);
+  DEFINE_CODE_STUB(LoadIC, TurboFanCodeStub);
 };
 
 class LoadGlobalICStub : public TurboFanCodeStub {
@@ -2213,15 +2211,15 @@ class KeyedLoadICStub : public PlatformCodeStub {
   void GenerateImpl(MacroAssembler* masm, bool in_frame);
 };
 
-class KeyedLoadICTFStub : public LoadICTFStub {
+class KeyedLoadICTFStub : public LoadICStub {
  public:
-  explicit KeyedLoadICTFStub(Isolate* isolate) : LoadICTFStub(isolate) {}
+  explicit KeyedLoadICTFStub(Isolate* isolate) : LoadICStub(isolate) {}
 
   void GenerateAssembly(CodeStubAssembler* assembler) const override;
 
   Code::Kind GetCodeKind() const override { return Code::KEYED_LOAD_IC; }
 
-  DEFINE_CODE_STUB(KeyedLoadICTF, LoadICTFStub);
+  DEFINE_CODE_STUB(KeyedLoadICTF, LoadICStub);
 };
 
 class StoreICStub : public PlatformCodeStub {
diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index c78a734a38..7a8789d891 100644
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -21828,7 +21828,7 @@ void TestStubCache(bool primary) {
       // Enforce recompilation of IC stubs that access megamorphic stub cache
       // to respect enabled native code counters and stub cache test flags.
       i::CodeStub::Major code_stub_keys[] = {
-          i::CodeStub::LoadICTF,     i::CodeStub::LoadICTrampolineTF,
+          i::CodeStub::LoadIC,       i::CodeStub::LoadICTrampoline,
           i::CodeStub::KeyedLoadIC,  i::CodeStub::KeyedLoadICTrampoline,
           i::CodeStub::StoreIC,      i::CodeStub::StoreICTrampoline,
           i::CodeStub::StoreICTF,    i::CodeStub::StoreICTrampolineTF,