diff --git a/icu4c/source/layout/GlyphSubstLookupProc.cpp b/icu4c/source/layout/GlyphSubstLookupProc.cpp
index 18ec1e265c..340df98222 100644
--- a/icu4c/source/layout/GlyphSubstLookupProc.cpp
+++ b/icu4c/source/layout/GlyphSubstLookupProc.cpp
@@ -15,9 +15,9 @@
 #include "GlyphDefinitionTables.h"
 #include "GlyphSubstitutionTables.h"
 #include "SingleSubstitutionSubtables.h"
-#include "MultipleSubstitutionSubtables.h"
+#include "MultipleSubstSubtables.h"
 #include "AlternateSubstSubtables.h"
-#include "LigatureSubstitutionSubtables.h"
+#include "LigatureSubstSubtables.h"
 #include "ContextualSubstSubtables.h"
 #include "LookupProcessor.h"
 #include "GlyphSubstLookupProc.h"
diff --git a/icu4c/source/layout/LigatureSubstProc.cpp b/icu4c/source/layout/LigatureSubstProc.cpp
index 28d7f17271..6b1e1304e5 100644
--- a/icu4c/source/layout/LigatureSubstProc.cpp
+++ b/icu4c/source/layout/LigatureSubstProc.cpp
@@ -11,7 +11,7 @@
 #include "MorphStateTables.h"
 #include "SubtableProcessor.h"
 #include "StateTableProcessor.h"
-#include "LigatureSubstitutionProcessor.h"
+#include "LigatureSubstProc.h"
 #include "LESwaps.h"
 
 #define ExtendedComplement(m) ((le_int32) (~((le_uint32) (m))))
diff --git a/icu4c/source/layout/LigatureSubstSubtables.cpp b/icu4c/source/layout/LigatureSubstSubtables.cpp
index 5f907841df..6f049625b5 100644
--- a/icu4c/source/layout/LigatureSubstSubtables.cpp
+++ b/icu4c/source/layout/LigatureSubstSubtables.cpp
@@ -9,7 +9,7 @@
 #include "LEGlyphFilter.h"
 #include "OpenTypeTables.h"
 #include "GlyphSubstitutionTables.h"
-#include "LigatureSubstitutionSubtables.h"
+#include "LigatureSubstSubtables.h"
 #include "GlyphIterator.h"
 #include "LESwaps.h"
 
diff --git a/icu4c/source/layout/MorphTables.cpp b/icu4c/source/layout/MorphTables.cpp
index 545701ad40..3290c09472 100644
--- a/icu4c/source/layout/MorphTables.cpp
+++ b/icu4c/source/layout/MorphTables.cpp
@@ -12,7 +12,7 @@
 #include "SubtableProcessor.h"
 #include "IndicRearrangementProcessor.h"
 #include "ContextualGlyphSubstProc.h"
-#include "LigatureSubstitutionProcessor.h"
+#include "LigatureSubstProc.h"
 #include "NonContextualGlyphSubstProc.h"
 //#include "ContextualGlyphInsertionProcessor.h"
 #include "LESwaps.h"
diff --git a/icu4c/source/layout/MultipleSubstSubtables.cpp b/icu4c/source/layout/MultipleSubstSubtables.cpp
index 63c09a00a8..3c53cc216c 100644
--- a/icu4c/source/layout/MultipleSubstSubtables.cpp
+++ b/icu4c/source/layout/MultipleSubstSubtables.cpp
@@ -9,7 +9,7 @@
 #include "LEGlyphFilter.h"
 #include "OpenTypeTables.h"
 #include "GlyphSubstitutionTables.h"
-#include "MultipleSubstitutionSubtables.h"
+#include "MultipleSubstSubtables.h"
 #include "GlyphIterator.h"
 #include "LESwaps.h"
 
diff --git a/icu4c/source/layout/layout.dsp b/icu4c/source/layout/layout.dsp
index 484e7f5907..050e3c92e6 100644
--- a/icu4c/source/layout/layout.dsp
+++ b/icu4c/source/layout/layout.dsp
@@ -608,11 +608,11 @@ SOURCE=.\LigatureSubstitution.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\LigatureSubstitutionProcessor.h
+SOURCE=.\LigatureSubstProc.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\LigatureSubstitutionSubtables.h
+SOURCE=.\LigatureSubstSubtables.h
 # End Source File
 # Begin Source File
 
@@ -679,7 +679,7 @@ SOURCE=.\MorphTables.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\MultipleSubstitutionSubtables.h
+SOURCE=.\MultipleSubstSubtables.h
 # End Source File
 # Begin Source File