diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
index 5754a343734..d0c827eb731 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Drivers/TwitterSettingsDisplayDriver.cs
@@ -45,7 +45,7 @@ public override async Task<IDisplayResult> EditAsync(TwitterSettings settings, B
                 return null;
             }
 
-            return Initialize<TwitterSettingsViewModel>("XSettings_Edit", model =>
+            return Initialize<TwitterSettingsViewModel>("TwitterSettings_Edit", model =>
             {
                 model.APIKey = settings.ConsumerKey;
                 if (!string.IsNullOrWhiteSpace(settings.ConsumerSecret))
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
index 9cd4f012eab..4b6859ee54d 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Manifest.cs
@@ -11,14 +11,14 @@
 
 [assembly: Feature(
     Id = TwitterConstants.Features.Twitter,
-    Name = "X Integration",
+    Name = "X (Twitter) Integration",
     Category = "X",
     Description = "Provides a TwitterClient and Workflow Activities to integrate with X"
 )]
 
 [assembly: Feature(
     Id = TwitterConstants.Features.Signin,
-    Name = "Sign in with X",
+    Name = "Sign in with X (Twitter)",
     Category = "X",
     Description = "Authenticates users with their X Account.",
     Dependencies = [TwitterConstants.Features.Twitter]
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
index e3331541314..38f287a9ac6 100644
--- a/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
+++ b/src/OrchardCore.Modules/OrchardCore.Twitter/Signin/Drivers/TwitterSigninSettingsDisplayDriver.cs
@@ -35,7 +35,7 @@ public override async Task<IDisplayResult> EditAsync(TwitterSigninSettings setti
                 return null;
             }
 
-            return Initialize<TwitterSigninSettingsViewModel>("XSigninSettings_Edit", model =>
+            return Initialize<TwitterSigninSettingsViewModel>("TwitterSigninSettings_Edit", model =>
             {
                 if (settings.CallbackPath.HasValue)
                 {
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Design.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Design.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Edit.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Edit.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Thumbnail.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateXStatusTask.Fields.Thumbnail.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/Items/UpdateTwitterStatusTask.Fields.Thumbnail.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSettings.Edit.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSettings.Edit.cshtml
diff --git a/src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSigninSettings.Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml
similarity index 100%
rename from src/OrchardCore.Modules/OrchardCore.Twitter/Views/XSigninSettings.Edit.cshtml
rename to src/OrchardCore.Modules/OrchardCore.Twitter/Views/TwitterSigninSettings.Edit.cshtml