diff --git a/src/BuildScriptGeneratorCli/Commands/BuildCommand.cs b/src/BuildScriptGeneratorCli/Commands/BuildCommand.cs
index 2eacdd2a81..0cb87651a9 100644
--- a/src/BuildScriptGeneratorCli/Commands/BuildCommand.cs
+++ b/src/BuildScriptGeneratorCli/Commands/BuildCommand.cs
@@ -47,14 +47,14 @@ internal class BuildCommand : CommandBase
         [Option(
             OptionTemplates.Platform,
             CommandOptionType.SingleValue,
-            Description = "The name of the programming language being used in the provided source directory.")]
-        public string Language { get; set; }
+            Description = "The name of the programming platform used in the provided source directory.")]
+        public string PlatformName { get; set; }
 
         [Option(
             OptionTemplates.PlatformVersion,
             CommandOptionType.SingleValue,
-            Description = "The version of programming language being used in the provided source directory.")]
-        public string LanguageVersion { get; set; }
+            Description = "The version of the programming platform used in the provided source directory.")]
+        public string PlatformVersion { get; set; }
 
         [Option(
             "-o|--output <dir>",
@@ -292,8 +292,8 @@ internal override void ConfigureBuildScriptGeneratorOptions(BuildScriptGenerator
                 SourceDir,
                 DestinationDir,
                 IntermediateDir,
-                Language,
-                LanguageVersion,
+                PlatformName,
+                PlatformVersion,
                 scriptOnly: false,
                 Properties);
         }
diff --git a/src/BuildScriptGeneratorCli/Commands/BuildScriptCommand.cs b/src/BuildScriptGeneratorCli/Commands/BuildScriptCommand.cs
index df0364fcfa..cf3ca04ca2 100644
--- a/src/BuildScriptGeneratorCli/Commands/BuildScriptCommand.cs
+++ b/src/BuildScriptGeneratorCli/Commands/BuildScriptCommand.cs
@@ -22,14 +22,14 @@ internal class BuildScriptCommand : CommandBase
         [Option(
             OptionTemplates.Platform,
             CommandOptionType.SingleValue,
-            Description = "The name of the programming language being used in the provided source directory.")]
-        public string Language { get; set; }
+            Description = "The name of the programming platform used in the provided source directory.")]
+        public string PlatformName { get; set; }
 
         [Option(
             OptionTemplates.PlatformVersion,
             CommandOptionType.SingleValue,
-            Description = "The version of programming language being used in the provided source directory.")]
-        public string LanguageVersion { get; set; }
+            Description = "The version of the programming platform used in the provided source directory.")]
+        public string PlatformVersion { get; set; }
 
         [Option(
             OptionTemplates.Property,
@@ -82,8 +82,8 @@ internal override void ConfigureBuildScriptGeneratorOptions(BuildScriptGenerator
                 SourceDir,
                 destinationDir: null,
                 intermediateDir: null,
-                Language,
-                LanguageVersion,
+                PlatformName,
+                PlatformVersion,
                 scriptOnly: true,
                 Properties);
         }