diff --git a/src/ICU4N/Globalization/CharSequencesExtension.cs b/src/ICU4N/Globalization/CharSequences.generated.cs
similarity index 100%
rename from src/ICU4N/Globalization/CharSequencesExtension.cs
rename to src/ICU4N/Globalization/CharSequences.generated.cs
diff --git a/src/ICU4N/Globalization/CharSequencesExtension.tt b/src/ICU4N/Globalization/CharSequences.generated.tt
similarity index 100%
rename from src/ICU4N/Globalization/CharSequencesExtension.tt
rename to src/ICU4N/Globalization/CharSequences.generated.tt
diff --git a/src/ICU4N/Globalization/UCharacterExtension.cs b/src/ICU4N/Globalization/UCharacter.generated.cs
similarity index 100%
rename from src/ICU4N/Globalization/UCharacterExtension.cs
rename to src/ICU4N/Globalization/UCharacter.generated.cs
diff --git a/src/ICU4N/Globalization/UCharacterExtension.tt b/src/ICU4N/Globalization/UCharacter.generated.tt
similarity index 100%
rename from src/ICU4N/Globalization/UCharacterExtension.tt
rename to src/ICU4N/Globalization/UCharacter.generated.tt
diff --git a/src/ICU4N/ICU4N.csproj b/src/ICU4N/ICU4N.csproj
index ff321da52..0620f2fba 100644
--- a/src/ICU4N/ICU4N.csproj
+++ b/src/ICU4N/ICU4N.csproj
@@ -403,226 +403,190 @@
   </UsingTask>
 
   <ItemGroup>
-    <None Include="Impl\Norm2AllModesExtension.cs">
+    <Compile Update="Globalization\CharSequences.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Norm2AllModesExtension.tt</DependentUpon>
-    </None>
-    <None Include="Impl\Number\AffixUtilsExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>AffixUtilsExtension.tt</DependentUpon>
-    </None>
-    <None Include="Impl\Number\NumberStringBuilderExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>NumberStringBuilderExtension.tt</DependentUpon>
-    </None>
-    <None Include="Impl\TextTrieMapExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>TextTrieMapExtension.tt</DependentUpon>
-    </None>
-    <None Include="Text\FilteredBreakIteratorBuilderExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>FilteredBreakIteratorBuilderExtension.tt</DependentUpon>
-    </None>
-    <None Include="Text\Normalizer2Extension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Normalizer2Extension.tt</DependentUpon>
-    </None>
-    <None Include="Util\CharsTrieBuilderExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>CharsTrieBuilderExtension.tt</DependentUpon>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="Globalization\CharSequencesExtension.cs">
-      <DesignTime>True</DesignTime>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>CharSequencesExtension.tt</DependentUpon>
+      <DependentUpon>CharSequences.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Globalization\UCharacterExtension.cs">
+    <Compile Update="Globalization\UCharacter.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UCharacterExtension.tt</DependentUpon>
+      <DependentUpon>UCharacter.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="ICUConfig.Designer.cs">
+    <Compile Update="Impl\BMPSet.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>ICUConfig.resx</DependentUpon>
+      <DependentUpon>BMPSet.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\BMPSetExtension.cs">
+    <Compile Update="Impl\CaseMapImpl.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>BMPSetExtension.tt</DependentUpon>
+      <DependentUpon>CaseMapImpl.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\CaseMapImplExtension.cs">
+    <Compile Update="Impl\Norm2AllModes.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>CaseMapImplExtension.tt</DependentUpon>
+      <DependentUpon>Norm2AllModes.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\Norm2AllModesExtension.cs">
+    <Compile Update="Impl\Normalizer2Impl.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Norm2AllModesExtension.tt</DependentUpon>
+      <DependentUpon>Normalizer2Impl.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\Normalizer2ImplExtension.cs">
+    <Compile Update="Impl\Number\AffixUtils.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Normalizer2ImplExtension.tt</DependentUpon>
+      <DependentUpon>AffixUtils.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\Number\AffixUtilsExtension.cs">
+    <Compile Update="Impl\Number\NumberStringBuilder.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>AffixUtilsExtension.tt</DependentUpon>
+      <DependentUpon>NumberStringBuilder.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\Number\NumberStringBuilderExtension.cs">
+    <Compile Update="Impl\PatternProps.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>NumberStringBuilderExtension.tt</DependentUpon>
+      <DependentUpon>PatternProps.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\PatternPropsExtension.cs">
+    <Compile Update="Impl\Punycode.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>PatternPropsExtension.tt</DependentUpon>
+      <DependentUpon>Punycode.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\PunycodeExtension.cs">
+    <Compile Update="Impl\SimpleFormatterImpl.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>PunycodeExtension.tt</DependentUpon>
+      <DependentUpon>SimpleFormatterImpl.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\SimpleFormatterImplExtension.cs">
+    <Compile Update="Impl\StandardPlural.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>SimpleFormatterImplExtension.tt</DependentUpon>
+      <DependentUpon>StandardPlural.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\StandardPluralExtension.cs">
+    <Compile Update="Impl\TextTrieMap.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>StandardPluralExtension.tt</DependentUpon>
+      <DependentUpon>TextTrieMap.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\TextTrieMapExtension.cs">
+    <Compile Update="Impl\UCaseProps.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>TextTrieMapExtension.tt</DependentUpon>
+      <DependentUpon>UCaseProps.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UCasePropsExtension.cs">
+    <Compile Update="Impl\UnicodeSetStringSpan.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UCasePropsExtension.tt</DependentUpon>
+      <DependentUpon>UnicodeSetStringSpan.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UnicodeSetStringSpanExtension.cs">
+    <Compile Update="Impl\UPropertyAliases.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetStringSpanExtension.tt</DependentUpon>
+      <DependentUpon>UPropertyAliases.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UPropertyAliasesExtension.cs">
+    <Compile Update="Impl\UResource.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UPropertyAliasesExtension.tt</DependentUpon>
+      <DependentUpon>UResource.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UResourceExtension.cs">
+    <Compile Update="Impl\Utility.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UResourceExtension.tt</DependentUpon>
+      <DependentUpon>Utility.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UtilityExtension.cs">
+    <Compile Update="Impl\UTS46.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UtilityExtension.tt</DependentUpon>
+      <DependentUpon>UTS46.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Impl\UTS46Extension.cs">
+    <Compile Update="Support\FormatNumberRuleBased.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UTS46Extension.tt</DependentUpon>
+      <DependentUpon>FormatNumberRuleBased.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Support\FormatNumberRuleBasedExtension.cs">
+    <Compile Update="Support\Text\UnicodeSetExtensions.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>FormatNumberRuleBasedExtension.tt</DependentUpon>
+      <DependentUpon>UnicodeSetExtensions.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Support\Numerics\BigMath\Messages.Designer.cs">
+    <Compile Update="Support\Text\UnicodeSetPartial.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Messages.resx</DependentUpon>
+      <DependentUpon>UnicodeSetPartial.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Support\Text\UnicodeSetExtensionsExtension.cs">
+    <Compile Update="Text\CaseMap.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetExtensionsExtension.tt</DependentUpon>
+      <DependentUpon>CaseMap.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Support\Text\UnicodeSetPartialExtension.cs">
+    <Compile Update="Text\FilteredBreakIteratorBuilder.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetPartialExtension.tt</DependentUpon>
+      <DependentUpon>FilteredBreakIteratorBuilder.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\CaseMapExtension.cs">
+    <Compile Update="Text\FilteredNormalizer2.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>CaseMapExtension.tt</DependentUpon>
+      <DependentUpon>FilteredNormalizer2.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\FilteredBreakIteratorBuilderExtension.cs">
+    <Compile Update="Text\IDNA.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>FilteredBreakIteratorBuilderExtension.tt</DependentUpon>
+      <DependentUpon>IDNA.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\FilteredNormalizer2Extension.cs">
+    <Compile Update="Text\Normalizer2.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>FilteredNormalizer2Extension.tt</DependentUpon>
+      <DependentUpon>Normalizer2.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\IDNAExtension.cs">
+    <Compile Update="Text\Normalizer.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>IDNAExtension.tt</DependentUpon>
+      <DependentUpon>Normalizer.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\Normalizer2Extension.cs">
+    <Compile Update="Text\SimpleFormatter.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>Normalizer2Extension.tt</DependentUpon>
+      <DependentUpon>SimpleFormatter.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\NormalizerExtension.cs">
+    <Compile Update="Text\UnicodeSet.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>NormalizerExtension.tt</DependentUpon>
+      <DependentUpon>UnicodeSet.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\SimpleFormatterExtension.cs">
+    <Compile Update="Text\UnicodeSetSpanner.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>SimpleFormatterExtension.tt</DependentUpon>
+      <DependentUpon>UnicodeSetSpanner.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\UnicodeSetExtension.cs">
+    <Compile Update="Text\UTF16.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetExtension.tt</DependentUpon>
+      <DependentUpon>UTF16.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\UnicodeSetSpannerExtension.cs">
+    <Compile Update="Util\CharsTrieBuilder.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetSpannerExtension.tt</DependentUpon>
+      <DependentUpon>CharsTrieBuilder.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Text\UTF16Extension.cs">
+    <Compile Update="Util\CharsTrie.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UTF16Extension.tt</DependentUpon>
+      <DependentUpon>CharsTrie.generated.tt</DependentUpon>
     </Compile>
-    <Compile Update="Util\CharsTrieBuilderExtension.cs">
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="ICUConfig.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>CharsTrieBuilderExtension.tt</DependentUpon>
+      <DependentUpon>ICUConfig.resx</DependentUpon>
     </Compile>
-    <Compile Update="Util\CharsTrieExtension.cs">
+    <Compile Update="Support\Numerics\BigMath\Messages.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>CharsTrieExtension.tt</DependentUpon>
+      <DependentUpon>Messages.resx</DependentUpon>
     </Compile>
   </ItemGroup>
-
   <ItemGroup>
     <EmbeddedResource Update="ICUConfig.resx">
       <Generator>ResXFileCodeGenerator</Generator>
@@ -635,141 +599,141 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Impl\BMPSetExtension.tt">
+    <None Update="Globalization\CharSequences.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>BMPSetExtension.cs</LastGenOutput>
+      <LastGenOutput>CharSequences.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\CaseMapImplExtension.tt">
+    <None Update="Globalization\UCharacter.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>CaseMapImplExtension.cs</LastGenOutput>
+      <LastGenOutput>UCharacter.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\Norm2AllModesExtension.tt">
+    <None Update="Impl\BMPSet.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Norm2AllModesExtension.cs</LastGenOutput>
+      <LastGenOutput>BMPSet.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\Normalizer2ImplExtension.tt">
+    <None Update="Impl\CaseMapImpl.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Normalizer2ImplExtension.cs</LastGenOutput>
+      <LastGenOutput>CaseMapImpl.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\Number\AffixUtilsExtension.tt">
+    <None Update="Impl\Norm2AllModes.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>AffixUtilsExtension.cs</LastGenOutput>
+      <LastGenOutput>Norm2AllModes.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\Number\NumberStringBuilderExtension.tt">
+    <None Update="Impl\Normalizer2Impl.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>NumberStringBuilderExtension.cs</LastGenOutput>
+      <LastGenOutput>Normalizer2Impl.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\PatternPropsExtension.tt">
+    <None Update="Impl\Number\AffixUtils.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>PatternPropsExtension.cs</LastGenOutput>
+      <LastGenOutput>AffixUtils.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\PunycodeExtension.tt">
+    <None Update="Impl\Number\NumberStringBuilder.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>PunycodeExtension.cs</LastGenOutput>
+      <LastGenOutput>NumberStringBuilder.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\SimpleFormatterImplExtension.tt">
+    <None Update="Impl\PatternProps.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>SimpleFormatterImplExtension.cs</LastGenOutput>
+      <LastGenOutput>PatternProps.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\StandardPluralExtension.tt">
+    <None Update="Impl\Punycode.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>StandardPluralExtension.cs</LastGenOutput>
+      <LastGenOutput>Punycode.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\TextTrieMapExtension.tt">
+    <None Update="Impl\SimpleFormatterImpl.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>TextTrieMapExtension.cs</LastGenOutput>
+      <LastGenOutput>SimpleFormatterImpl.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UCasePropsExtension.tt">
+    <None Update="Impl\StandardPlural.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UCasePropsExtension.cs</LastGenOutput>
+      <LastGenOutput>StandardPlural.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UnicodeSetStringSpanExtension.tt">
+    <None Update="Impl\TextTrieMap.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetStringSpanExtension.cs</LastGenOutput>
+      <LastGenOutput>TextTrieMap.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UPropertyAliasesExtension.tt">
+    <None Update="Impl\UCaseProps.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UPropertyAliasesExtension.cs</LastGenOutput>
+      <LastGenOutput>UCaseProps.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UResourceExtension.tt">
+    <None Update="Impl\UnicodeSetStringSpan.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UResourceExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSetStringSpan.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UtilityExtension.tt">
+    <None Update="Impl\UPropertyAliases.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UtilityExtension.cs</LastGenOutput>
+      <LastGenOutput>UPropertyAliases.generated.cs</LastGenOutput>
     </None>
-    <None Update="Impl\UTS46Extension.tt">
+    <None Update="Impl\UResource.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UTS46Extension.cs</LastGenOutput>
+      <LastGenOutput>UResource.generated.cs</LastGenOutput>
     </None>
-    <None Update="Globalization\CharSequencesExtension.tt">
+    <None Update="Impl\Utility.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>CharSequencesExtension.cs</LastGenOutput>
+      <LastGenOutput>Utility.generated.cs</LastGenOutput>
     </None>
-    <None Update="Globalization\UCharacterExtension.tt">
+    <None Update="Impl\UTS46.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UCharacterExtension.cs</LastGenOutput>
+      <LastGenOutput>UTS46.generated.cs</LastGenOutput>
     </None>
-    <None Update="Support\FormatNumberRuleBasedExtension.tt">
+    <None Update="Support\FormatNumberRuleBased.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>FormatNumberRuleBasedExtension.cs</LastGenOutput>
+      <LastGenOutput>FormatNumberRuleBased.generated.cs</LastGenOutput>
     </None>
-    <None Update="Support\Text\UnicodeSetExtensionsExtension.tt">
+    <None Update="Support\Text\UnicodeSetExtensions.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetExtensionsExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSetExtensions.generated.cs</LastGenOutput>
     </None>
-    <None Update="Support\Text\UnicodeSetPartialExtension.tt">
+    <None Update="Support\Text\UnicodeSetPartial.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetPartialExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSetPartial.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\CaseMapExtension.tt">
+    <None Update="Text\CaseMap.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>CaseMapExtension.cs</LastGenOutput>
+      <LastGenOutput>CaseMap.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\FilteredBreakIteratorBuilderExtension.tt">
+    <None Update="Text\FilteredBreakIteratorBuilder.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>FilteredBreakIteratorBuilderExtension.cs</LastGenOutput>
+      <LastGenOutput>FilteredBreakIteratorBuilder.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\FilteredNormalizer2Extension.tt">
+    <None Update="Text\FilteredNormalizer2.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>FilteredNormalizer2Extension.cs</LastGenOutput>
+      <LastGenOutput>FilteredNormalizer2.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\IDNAExtension.tt">
+    <None Update="Text\IDNA.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>IDNAExtension.cs</LastGenOutput>
+      <LastGenOutput>IDNA.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\Normalizer2Extension.tt">
+    <None Update="Text\Normalizer2.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>Normalizer2Extension.cs</LastGenOutput>
+      <LastGenOutput>Normalizer2.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\NormalizerExtension.tt">
+    <None Update="Text\Normalizer.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>NormalizerExtension.cs</LastGenOutput>
+      <LastGenOutput>Normalizer.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\SimpleFormatterExtension.tt">
+    <None Update="Text\SimpleFormatter.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>SimpleFormatterExtension.cs</LastGenOutput>
+      <LastGenOutput>SimpleFormatter.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\UnicodeSetExtension.tt">
+    <None Update="Text\UnicodeSet.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSet.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\UnicodeSetSpannerExtension.tt">
+    <None Update="Text\UnicodeSetSpanner.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetSpannerExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSetSpanner.generated.cs</LastGenOutput>
     </None>
-    <None Update="Text\UTF16Extension.tt">
+    <None Update="Text\UTF16.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UTF16Extension.cs</LastGenOutput>
+      <LastGenOutput>UTF16.generated.cs</LastGenOutput>
     </None>
-    <None Update="Util\CharsTrieBuilderExtension.tt">
+    <None Update="Util\CharsTrieBuilder.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>CharsTrieBuilderExtension.cs</LastGenOutput>
+      <LastGenOutput>CharsTrieBuilder.generated.cs</LastGenOutput>
     </None>
-    <None Update="Util\CharsTrieExtension.tt">
+    <None Update="Util\CharsTrie.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>CharsTrieExtension.cs</LastGenOutput>
+      <LastGenOutput>CharsTrie.generated.cs</LastGenOutput>
     </None>
   </ItemGroup>
 
@@ -779,6 +743,6 @@
 
   <!-- Explicitly importing SDK to allow for T4 template generation. See: https://developercommunity.visualstudio.com/t/upgrading-to-sdk-style-project-disables-t4-transfo/1394852 -->
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="$(RepositoryRoot).build/t4-transform.targets"/>
+  <Import Project="$(RepositoryRoot).build/t4-transform.targets" />
 
 </Project>
diff --git a/src/ICU4N/Impl/BMPSetExtension.cs b/src/ICU4N/Impl/BMPSet.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/BMPSetExtension.cs
rename to src/ICU4N/Impl/BMPSet.generated.cs
diff --git a/src/ICU4N/Impl/BMPSetExtension.tt b/src/ICU4N/Impl/BMPSet.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/BMPSetExtension.tt
rename to src/ICU4N/Impl/BMPSet.generated.tt
diff --git a/src/ICU4N/Impl/CaseMapImplExtension.cs b/src/ICU4N/Impl/CaseMapImpl.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/CaseMapImplExtension.cs
rename to src/ICU4N/Impl/CaseMapImpl.generated.cs
diff --git a/src/ICU4N/Impl/CaseMapImplExtension.tt b/src/ICU4N/Impl/CaseMapImpl.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/CaseMapImplExtension.tt
rename to src/ICU4N/Impl/CaseMapImpl.generated.tt
diff --git a/src/ICU4N/Impl/Norm2AllModesExtension.cs b/src/ICU4N/Impl/Norm2AllModes.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/Norm2AllModesExtension.cs
rename to src/ICU4N/Impl/Norm2AllModes.generated.cs
diff --git a/src/ICU4N/Impl/Norm2AllModesExtension.tt b/src/ICU4N/Impl/Norm2AllModes.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/Norm2AllModesExtension.tt
rename to src/ICU4N/Impl/Norm2AllModes.generated.tt
diff --git a/src/ICU4N/Impl/Normalizer2ImplExtension.cs b/src/ICU4N/Impl/Normalizer2Impl.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/Normalizer2ImplExtension.cs
rename to src/ICU4N/Impl/Normalizer2Impl.generated.cs
diff --git a/src/ICU4N/Impl/Normalizer2ImplExtension.tt b/src/ICU4N/Impl/Normalizer2Impl.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/Normalizer2ImplExtension.tt
rename to src/ICU4N/Impl/Normalizer2Impl.generated.tt
diff --git a/src/ICU4N/Impl/Number/AffixUtilsExtension.cs b/src/ICU4N/Impl/Number/AffixUtils.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/Number/AffixUtilsExtension.cs
rename to src/ICU4N/Impl/Number/AffixUtils.generated.cs
diff --git a/src/ICU4N/Impl/Number/AffixUtilsExtension.tt b/src/ICU4N/Impl/Number/AffixUtils.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/Number/AffixUtilsExtension.tt
rename to src/ICU4N/Impl/Number/AffixUtils.generated.tt
diff --git a/src/ICU4N/Impl/Number/NumberStringBuilderExtension.cs b/src/ICU4N/Impl/Number/NumberStringBuilder.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/Number/NumberStringBuilderExtension.cs
rename to src/ICU4N/Impl/Number/NumberStringBuilder.generated.cs
diff --git a/src/ICU4N/Impl/Number/NumberStringBuilderExtension.tt b/src/ICU4N/Impl/Number/NumberStringBuilder.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/Number/NumberStringBuilderExtension.tt
rename to src/ICU4N/Impl/Number/NumberStringBuilder.generated.tt
diff --git a/src/ICU4N/Impl/PatternPropsExtension.cs b/src/ICU4N/Impl/PatternProps.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/PatternPropsExtension.cs
rename to src/ICU4N/Impl/PatternProps.generated.cs
diff --git a/src/ICU4N/Impl/PatternPropsExtension.tt b/src/ICU4N/Impl/PatternProps.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/PatternPropsExtension.tt
rename to src/ICU4N/Impl/PatternProps.generated.tt
diff --git a/src/ICU4N/Impl/PunycodeExtension.cs b/src/ICU4N/Impl/Punycode.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/PunycodeExtension.cs
rename to src/ICU4N/Impl/Punycode.generated.cs
diff --git a/src/ICU4N/Impl/PunycodeExtension.tt b/src/ICU4N/Impl/Punycode.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/PunycodeExtension.tt
rename to src/ICU4N/Impl/Punycode.generated.tt
diff --git a/src/ICU4N/Impl/SimpleFormatterImplExtension.cs b/src/ICU4N/Impl/SimpleFormatterImpl.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/SimpleFormatterImplExtension.cs
rename to src/ICU4N/Impl/SimpleFormatterImpl.generated.cs
diff --git a/src/ICU4N/Impl/SimpleFormatterImplExtension.tt b/src/ICU4N/Impl/SimpleFormatterImpl.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/SimpleFormatterImplExtension.tt
rename to src/ICU4N/Impl/SimpleFormatterImpl.generated.tt
diff --git a/src/ICU4N/Impl/StandardPluralExtension.cs b/src/ICU4N/Impl/StandardPlural.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/StandardPluralExtension.cs
rename to src/ICU4N/Impl/StandardPlural.generated.cs
diff --git a/src/ICU4N/Impl/StandardPluralExtension.tt b/src/ICU4N/Impl/StandardPlural.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/StandardPluralExtension.tt
rename to src/ICU4N/Impl/StandardPlural.generated.tt
diff --git a/src/ICU4N/Impl/TextTrieMapExtension.cs b/src/ICU4N/Impl/TextTrieMap.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/TextTrieMapExtension.cs
rename to src/ICU4N/Impl/TextTrieMap.generated.cs
diff --git a/src/ICU4N/Impl/TextTrieMapExtension.tt b/src/ICU4N/Impl/TextTrieMap.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/TextTrieMapExtension.tt
rename to src/ICU4N/Impl/TextTrieMap.generated.tt
diff --git a/src/ICU4N/Impl/UCasePropsExtension.cs b/src/ICU4N/Impl/UCaseProps.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UCasePropsExtension.cs
rename to src/ICU4N/Impl/UCaseProps.generated.cs
diff --git a/src/ICU4N/Impl/UCasePropsExtension.tt b/src/ICU4N/Impl/UCaseProps.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UCasePropsExtension.tt
rename to src/ICU4N/Impl/UCaseProps.generated.tt
diff --git a/src/ICU4N/Impl/UPropertyAliasesExtension.cs b/src/ICU4N/Impl/UPropertyAliases.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UPropertyAliasesExtension.cs
rename to src/ICU4N/Impl/UPropertyAliases.generated.cs
diff --git a/src/ICU4N/Impl/UPropertyAliasesExtension.tt b/src/ICU4N/Impl/UPropertyAliases.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UPropertyAliasesExtension.tt
rename to src/ICU4N/Impl/UPropertyAliases.generated.tt
diff --git a/src/ICU4N/Impl/UResourceExtension.cs b/src/ICU4N/Impl/UResource.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UResourceExtension.cs
rename to src/ICU4N/Impl/UResource.generated.cs
diff --git a/src/ICU4N/Impl/UResourceExtension.tt b/src/ICU4N/Impl/UResource.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UResourceExtension.tt
rename to src/ICU4N/Impl/UResource.generated.tt
diff --git a/src/ICU4N/Impl/UTS46Extension.cs b/src/ICU4N/Impl/UTS46.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UTS46Extension.cs
rename to src/ICU4N/Impl/UTS46.generated.cs
diff --git a/src/ICU4N/Impl/UTS46Extension.tt b/src/ICU4N/Impl/UTS46.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UTS46Extension.tt
rename to src/ICU4N/Impl/UTS46.generated.tt
diff --git a/src/ICU4N/Impl/UnicodeSetStringSpanExtension.cs b/src/ICU4N/Impl/UnicodeSetStringSpan.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UnicodeSetStringSpanExtension.cs
rename to src/ICU4N/Impl/UnicodeSetStringSpan.generated.cs
diff --git a/src/ICU4N/Impl/UnicodeSetStringSpanExtension.tt b/src/ICU4N/Impl/UnicodeSetStringSpan.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UnicodeSetStringSpanExtension.tt
rename to src/ICU4N/Impl/UnicodeSetStringSpan.generated.tt
diff --git a/src/ICU4N/Impl/UtilityExtension.cs b/src/ICU4N/Impl/Utility.generated.cs
similarity index 100%
rename from src/ICU4N/Impl/UtilityExtension.cs
rename to src/ICU4N/Impl/Utility.generated.cs
diff --git a/src/ICU4N/Impl/UtilityExtension.tt b/src/ICU4N/Impl/Utility.generated.tt
similarity index 100%
rename from src/ICU4N/Impl/UtilityExtension.tt
rename to src/ICU4N/Impl/Utility.generated.tt
diff --git a/src/ICU4N/Support/FormatNumberRuleBasedExtension.cs b/src/ICU4N/Support/FormatNumberRuleBased.generated.cs
similarity index 100%
rename from src/ICU4N/Support/FormatNumberRuleBasedExtension.cs
rename to src/ICU4N/Support/FormatNumberRuleBased.generated.cs
diff --git a/src/ICU4N/Support/FormatNumberRuleBasedExtension.tt b/src/ICU4N/Support/FormatNumberRuleBased.generated.tt
similarity index 100%
rename from src/ICU4N/Support/FormatNumberRuleBasedExtension.tt
rename to src/ICU4N/Support/FormatNumberRuleBased.generated.tt
diff --git a/src/ICU4N/Support/Text/UnicodeSetExtensionsExtension.cs b/src/ICU4N/Support/Text/UnicodeSetExtensions.generated.cs
similarity index 100%
rename from src/ICU4N/Support/Text/UnicodeSetExtensionsExtension.cs
rename to src/ICU4N/Support/Text/UnicodeSetExtensions.generated.cs
diff --git a/src/ICU4N/Support/Text/UnicodeSetExtensionsExtension.tt b/src/ICU4N/Support/Text/UnicodeSetExtensions.generated.tt
similarity index 100%
rename from src/ICU4N/Support/Text/UnicodeSetExtensionsExtension.tt
rename to src/ICU4N/Support/Text/UnicodeSetExtensions.generated.tt
diff --git a/src/ICU4N/Support/Text/UnicodeSetPartialExtension.cs b/src/ICU4N/Support/Text/UnicodeSetPartial.generated.cs
similarity index 100%
rename from src/ICU4N/Support/Text/UnicodeSetPartialExtension.cs
rename to src/ICU4N/Support/Text/UnicodeSetPartial.generated.cs
diff --git a/src/ICU4N/Support/Text/UnicodeSetPartialExtension.tt b/src/ICU4N/Support/Text/UnicodeSetPartial.generated.tt
similarity index 100%
rename from src/ICU4N/Support/Text/UnicodeSetPartialExtension.tt
rename to src/ICU4N/Support/Text/UnicodeSetPartial.generated.tt
diff --git a/src/ICU4N/Text/CaseMapExtension.cs b/src/ICU4N/Text/CaseMap.generated.cs
similarity index 100%
rename from src/ICU4N/Text/CaseMapExtension.cs
rename to src/ICU4N/Text/CaseMap.generated.cs
diff --git a/src/ICU4N/Text/CaseMapExtension.tt b/src/ICU4N/Text/CaseMap.generated.tt
similarity index 100%
rename from src/ICU4N/Text/CaseMapExtension.tt
rename to src/ICU4N/Text/CaseMap.generated.tt
diff --git a/src/ICU4N/Text/FilteredBreakIteratorBuilderExtension.cs b/src/ICU4N/Text/FilteredBreakIteratorBuilder.generated.cs
similarity index 100%
rename from src/ICU4N/Text/FilteredBreakIteratorBuilderExtension.cs
rename to src/ICU4N/Text/FilteredBreakIteratorBuilder.generated.cs
diff --git a/src/ICU4N/Text/FilteredBreakIteratorBuilderExtension.tt b/src/ICU4N/Text/FilteredBreakIteratorBuilder.generated.tt
similarity index 100%
rename from src/ICU4N/Text/FilteredBreakIteratorBuilderExtension.tt
rename to src/ICU4N/Text/FilteredBreakIteratorBuilder.generated.tt
diff --git a/src/ICU4N/Text/FilteredNormalizer2Extension.cs b/src/ICU4N/Text/FilteredNormalizer2.generated.cs
similarity index 100%
rename from src/ICU4N/Text/FilteredNormalizer2Extension.cs
rename to src/ICU4N/Text/FilteredNormalizer2.generated.cs
diff --git a/src/ICU4N/Text/FilteredNormalizer2Extension.tt b/src/ICU4N/Text/FilteredNormalizer2.generated.tt
similarity index 100%
rename from src/ICU4N/Text/FilteredNormalizer2Extension.tt
rename to src/ICU4N/Text/FilteredNormalizer2.generated.tt
diff --git a/src/ICU4N/Text/IDNAExtension.cs b/src/ICU4N/Text/IDNA.generated.cs
similarity index 100%
rename from src/ICU4N/Text/IDNAExtension.cs
rename to src/ICU4N/Text/IDNA.generated.cs
diff --git a/src/ICU4N/Text/IDNAExtension.tt b/src/ICU4N/Text/IDNA.generated.tt
similarity index 100%
rename from src/ICU4N/Text/IDNAExtension.tt
rename to src/ICU4N/Text/IDNA.generated.tt
diff --git a/src/ICU4N/Text/NormalizerExtension.cs b/src/ICU4N/Text/Normalizer.generated.cs
similarity index 100%
rename from src/ICU4N/Text/NormalizerExtension.cs
rename to src/ICU4N/Text/Normalizer.generated.cs
diff --git a/src/ICU4N/Text/NormalizerExtension.tt b/src/ICU4N/Text/Normalizer.generated.tt
similarity index 100%
rename from src/ICU4N/Text/NormalizerExtension.tt
rename to src/ICU4N/Text/Normalizer.generated.tt
diff --git a/src/ICU4N/Text/Normalizer2Extension.cs b/src/ICU4N/Text/Normalizer2.generated.cs
similarity index 100%
rename from src/ICU4N/Text/Normalizer2Extension.cs
rename to src/ICU4N/Text/Normalizer2.generated.cs
diff --git a/src/ICU4N/Text/Normalizer2Extension.tt b/src/ICU4N/Text/Normalizer2.generated.tt
similarity index 100%
rename from src/ICU4N/Text/Normalizer2Extension.tt
rename to src/ICU4N/Text/Normalizer2.generated.tt
diff --git a/src/ICU4N/Text/SimpleFormatterExtension.cs b/src/ICU4N/Text/SimpleFormatter.generated.cs
similarity index 100%
rename from src/ICU4N/Text/SimpleFormatterExtension.cs
rename to src/ICU4N/Text/SimpleFormatter.generated.cs
diff --git a/src/ICU4N/Text/SimpleFormatterExtension.tt b/src/ICU4N/Text/SimpleFormatter.generated.tt
similarity index 100%
rename from src/ICU4N/Text/SimpleFormatterExtension.tt
rename to src/ICU4N/Text/SimpleFormatter.generated.tt
diff --git a/src/ICU4N/Text/UTF16Extension.cs b/src/ICU4N/Text/UTF16.generated.cs
similarity index 100%
rename from src/ICU4N/Text/UTF16Extension.cs
rename to src/ICU4N/Text/UTF16.generated.cs
diff --git a/src/ICU4N/Text/UTF16Extension.tt b/src/ICU4N/Text/UTF16.generated.tt
similarity index 100%
rename from src/ICU4N/Text/UTF16Extension.tt
rename to src/ICU4N/Text/UTF16.generated.tt
diff --git a/src/ICU4N/Text/UnicodeSetExtension.cs b/src/ICU4N/Text/UnicodeSet.generated.cs
similarity index 100%
rename from src/ICU4N/Text/UnicodeSetExtension.cs
rename to src/ICU4N/Text/UnicodeSet.generated.cs
diff --git a/src/ICU4N/Text/UnicodeSetExtension.tt b/src/ICU4N/Text/UnicodeSet.generated.tt
similarity index 100%
rename from src/ICU4N/Text/UnicodeSetExtension.tt
rename to src/ICU4N/Text/UnicodeSet.generated.tt
diff --git a/src/ICU4N/Text/UnicodeSetSpannerExtension.cs b/src/ICU4N/Text/UnicodeSetSpanner.generated.cs
similarity index 100%
rename from src/ICU4N/Text/UnicodeSetSpannerExtension.cs
rename to src/ICU4N/Text/UnicodeSetSpanner.generated.cs
diff --git a/src/ICU4N/Text/UnicodeSetSpannerExtension.tt b/src/ICU4N/Text/UnicodeSetSpanner.generated.tt
similarity index 100%
rename from src/ICU4N/Text/UnicodeSetSpannerExtension.tt
rename to src/ICU4N/Text/UnicodeSetSpanner.generated.tt
diff --git a/src/ICU4N/Util/CharsTrieExtension.cs b/src/ICU4N/Util/CharsTrie.generated.cs
similarity index 100%
rename from src/ICU4N/Util/CharsTrieExtension.cs
rename to src/ICU4N/Util/CharsTrie.generated.cs
diff --git a/src/ICU4N/Util/CharsTrieExtension.tt b/src/ICU4N/Util/CharsTrie.generated.tt
similarity index 100%
rename from src/ICU4N/Util/CharsTrieExtension.tt
rename to src/ICU4N/Util/CharsTrie.generated.tt
diff --git a/src/ICU4N/Util/CharsTrieBuilderExtension.cs b/src/ICU4N/Util/CharsTrieBuilder.generated.cs
similarity index 100%
rename from src/ICU4N/Util/CharsTrieBuilderExtension.cs
rename to src/ICU4N/Util/CharsTrieBuilder.generated.cs
diff --git a/src/ICU4N/Util/CharsTrieBuilderExtension.tt b/src/ICU4N/Util/CharsTrieBuilder.generated.tt
similarity index 100%
rename from src/ICU4N/Util/CharsTrieBuilderExtension.tt
rename to src/ICU4N/Util/CharsTrieBuilder.generated.tt
diff --git a/tests/ICU4N.Tests/ICU4N.Tests.csproj b/tests/ICU4N.Tests/ICU4N.Tests.csproj
index addc4728a..709b9b32d 100644
--- a/tests/ICU4N.Tests/ICU4N.Tests.csproj
+++ b/tests/ICU4N.Tests/ICU4N.Tests.csproj
@@ -54,9 +54,9 @@
   </ItemGroup>
   
   <ItemGroup>
-    <None Update="Support\Text\UnicodeSetPartialTestExtension.tt">
+    <None Update="Support\Text\UnicodeSetPartialTest.generated.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
-      <LastGenOutput>UnicodeSetPartialTestExtension.cs</LastGenOutput>
+      <LastGenOutput>UnicodeSetPartialTest.generated.cs</LastGenOutput>
     </None>
   </ItemGroup>
   
@@ -65,15 +65,15 @@
   </ItemGroup>
   
   <ItemGroup>
-    <Compile Update="Support\Text\UnicodeSetPartialTestExtension.cs">
+    <Compile Update="Support\Text\UnicodeSetPartialTest.generated.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
-      <DependentUpon>UnicodeSetPartialTestExtension.tt</DependentUpon>
+      <DependentUpon>UnicodeSetPartialTest.generated.tt</DependentUpon>
     </Compile>
   </ItemGroup>
 
   <!-- Explicitly importing SDK to allow for T4 template generation. See: https://developercommunity.visualstudio.com/t/upgrading-to-sdk-style-project-disables-t4-transfo/1394852 -->
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="$(RepositoryRoot).build/t4-transform.targets"/>
+  <Import Project="$(RepositoryRoot).build/t4-transform.targets" />
 
 </Project>
\ No newline at end of file
diff --git a/tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTestExtension.cs b/tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTest.generated.cs
similarity index 100%
rename from tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTestExtension.cs
rename to tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTest.generated.cs
diff --git a/tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTestExtension.tt b/tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTest.generated.tt
similarity index 100%
rename from tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTestExtension.tt
rename to tests/ICU4N.Tests/Support/Text/UnicodeSetPartialTest.generated.tt