diff --git a/src/Spectre.Console/Cli/AsyncCommand`1.cs b/src/Spectre.Console/Cli/AsyncCommandOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/AsyncCommand`1.cs
rename to src/Spectre.Console/Cli/AsyncCommandOfT.cs
diff --git a/src/Spectre.Console/Cli/CommandApp`1.cs b/src/Spectre.Console/Cli/CommandAppOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/CommandApp`1.cs
rename to src/Spectre.Console/Cli/CommandAppOfT.cs
diff --git a/src/Spectre.Console/Cli/Command`1.cs b/src/Spectre.Console/Cli/CommandOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/Command`1.cs
rename to src/Spectre.Console/Cli/CommandOfT.cs
diff --git a/src/Spectre.Console/Cli/ICommandLimiter`1.cs b/src/Spectre.Console/Cli/ICommandLimiterOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/ICommandLimiter`1.cs
rename to src/Spectre.Console/Cli/ICommandLimiterOfT.cs
diff --git a/src/Spectre.Console/Cli/ICommand`1.cs b/src/Spectre.Console/Cli/ICommandOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/ICommand`1.cs
rename to src/Spectre.Console/Cli/ICommandOfT.cs
diff --git a/src/Spectre.Console/Cli/IConfigurator`1.cs b/src/Spectre.Console/Cli/IConfiguratorOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/IConfigurator`1.cs
rename to src/Spectre.Console/Cli/IConfiguratorOfT.cs
diff --git a/src/Spectre.Console/Cli/Internal/Configuration/Configurator`1.cs b/src/Spectre.Console/Cli/Internal/Configuration/ConfiguratorOfT.cs
similarity index 100%
rename from src/Spectre.Console/Cli/Internal/Configuration/Configurator`1.cs
rename to src/Spectre.Console/Cli/Internal/Configuration/ConfiguratorOfT.cs