diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
index 41d06a2ae..34e776ada 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/RunCommand.cs
@@ -98,7 +98,7 @@ private void EvaluateEnvironmentVariables(RunCommandSettings settings)
             var envValue = environmentVariables[LAMBDA_RUNTIME_API_PORT]?.ToString();
             if (int.TryParse(envValue, out var port))
             {
-                settings.Port = port;
+                settings.LambdaEmulatorPort = port;
             }
             else
             {
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/Settings/RunCommandSettings.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/Settings/RunCommandSettings.cs
index c6c742ff8..151cc6600 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/Settings/RunCommandSettings.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Commands/Settings/RunCommandSettings.cs
@@ -16,19 +16,19 @@ public sealed class RunCommandSettings : CommandSettings
     /// The hostname or IP address used for the test tool's web interface.
     /// Any host other than an explicit IP address or localhost (e.g. '*', '+' or 'example.com') binds to all public IPv4 and IPv6 addresses.
     /// </summary>
-    [CommandOption("--host <HOST>")]
+    [CommandOption("--lambda-emulator-host <HOST>")]
     [Description(
         "The hostname or IP address used for the test tool's web interface. Any host other than an explicit IP address or localhost (e.g. '*', '+' or 'example.com') binds to all public IPv4 and IPv6 addresses.")]
-    [DefaultValue(Constants.DefaultHost)]
-    public string Host { get; set; } = Constants.DefaultHost;
+    [DefaultValue(Constants.DefaultLambdaEmulatorHost)]
+    public string LambdaEmulatorHost { get; set; } = Constants.DefaultLambdaEmulatorHost;
 
     /// <summary>
     /// The port number used for the test tool's web interface.
     /// </summary>
-    [CommandOption("-p|--port <PORT>")]
+    [CommandOption("-p|--lambda-emulator-port <PORT>")]
     [Description("The port number used for the test tool's web interface.")]
-    [DefaultValue(Constants.DefaultLambdaRuntimeEmulatorPort)]
-    public int Port { get; set; } = Constants.DefaultLambdaRuntimeEmulatorPort;
+    [DefaultValue(Constants.DefaultLambdaEmulatorPort)]
+    public int LambdaEmulatorPort { get; set; } = Constants.DefaultLambdaEmulatorPort;
 
     /// <summary>
     /// Disable auto launching the test tool's web interface in a browser.
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
index 93ff8ed2b..6d0c31af5 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Constants.cs
@@ -18,7 +18,7 @@ public abstract class Constants
     /// <summary>
     /// The default port used by the Lambda Test Tool for the Lambda Runtime API and the Web Interface.
     /// </summary>
-    public const int DefaultLambdaRuntimeEmulatorPort = 5050;
+    public const int DefaultLambdaEmulatorPort = 5050;
 
     /// <summary>
     /// The default port used by the API Gateway Emulator.
@@ -28,7 +28,7 @@ public abstract class Constants
     /// <summary>
     /// The default hostname used for the Lambda Test Tool.
     /// </summary>
-    public const string DefaultHost = "localhost";
+    public const string DefaultLambdaEmulatorHost = "localhost";
 
     /// <summary>
     /// The default mode for the API Gateway Emulator.
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/ApiGatewayEmulatorProcess.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/ApiGatewayEmulatorProcess.cs
index 8c8f584f8..8f654ae55 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/ApiGatewayEmulatorProcess.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/ApiGatewayEmulatorProcess.cs
@@ -48,7 +48,7 @@ public static ApiGatewayEmulatorProcess Startup(RunCommandSettings settings, Can
 
         builder.Services.AddApiGatewayEmulatorServices();
 
-        var serviceUrl = $"http://{settings.Host}:{settings.ApiGatewayEmulatorPort}";
+        var serviceUrl = $"http://{settings.LambdaEmulatorHost}:{settings.ApiGatewayEmulatorPort}";
         builder.WebHost.UseUrls(serviceUrl);
         builder.WebHost.SuppressStatusMessages(true);
 
diff --git a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
index d3b93877b..2cded6f14 100644
--- a/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
+++ b/Tools/LambdaTestTool-v2/src/Amazon.Lambda.TestTool/Processes/TestToolProcess.cs
@@ -54,7 +54,7 @@ public static TestToolProcess Startup(RunCommandSettings settings, CancellationT
         }
         builder.Services.AddSingleton<IDirectoryManager, DirectoryManager>();
 
-        var serviceUrl = $"http://{settings.Host}:{settings.Port}";
+        var serviceUrl = $"http://{settings.LambdaEmulatorHost}:{settings.LambdaEmulatorPort}";
         builder.WebHost.UseUrls(serviceUrl);
         builder.WebHost.SuppressStatusMessages(true);
 
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayEmulatorProcessTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayEmulatorProcessTests.cs
index 0bc229bcd..eb5b693a1 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayEmulatorProcessTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.IntegrationTests/ApiGatewayEmulatorProcessTests.cs
@@ -246,7 +246,7 @@ private void StartTestToolProcess(ApiGatewayEmulatorMode apiGatewayMode, TestCon
             ""Path"": ""/{config.RouteName}""
         }}");
         cancellationTokenSource.CancelAfter(5000);
-        var settings = new RunCommandSettings { Port = lambdaPort, NoLaunchWindow = true, ApiGatewayEmulatorMode = apiGatewayMode,ApiGatewayEmulatorPort = apiGatewayPort};
+        var settings = new RunCommandSettings { LambdaEmulatorPort = lambdaPort, NoLaunchWindow = true, ApiGatewayEmulatorMode = apiGatewayMode,ApiGatewayEmulatorPort = apiGatewayPort};
         var command = new RunCommand(_mockInteractiveService.Object, _mockEnvironmentManager.Object);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);
 
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/RunCommandTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/RunCommandTests.cs
index 4e08b7536..5ef8a445b 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/RunCommandTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/RunCommandTests.cs
@@ -27,10 +27,10 @@ public async Task ExecuteAsync_LambdaRuntimeApi_SuccessfulLaunch()
         Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
         var cancellationSource = new CancellationTokenSource();
         cancellationSource.CancelAfter(5000);
-        var settings = new RunCommandSettings { Port = 9001, NoLaunchWindow = true };
+        var settings = new RunCommandSettings { LambdaEmulatorPort = 9001, NoLaunchWindow = true };
         var command = new RunCommand(_mockInteractiveService.Object, _mockEnvironmentManager.Object);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);
-        var apiUrl = $"http://{settings.Host}:{settings.Port}";
+        var apiUrl = $"http://{settings.LambdaEmulatorHost}:{settings.LambdaEmulatorPort}";
 
         // Act
         var runningTask = command.ExecuteAsync(context, settings, cancellationSource);
@@ -50,10 +50,10 @@ public async Task ExecuteAsync_ApiGatewayEmulator_SuccessfulLaunch()
         Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
         var cancellationSource = new CancellationTokenSource();
         cancellationSource.CancelAfter(5000);
-        var settings = new RunCommandSettings { Port = 9002,  ApiGatewayEmulatorMode = ApiGatewayEmulatorMode.HttpV2, NoLaunchWindow = true};
+        var settings = new RunCommandSettings { LambdaEmulatorPort = 9002,  ApiGatewayEmulatorMode = ApiGatewayEmulatorMode.HttpV2, NoLaunchWindow = true};
         var command = new RunCommand(_mockInteractiveService.Object, _mockEnvironmentManager.Object);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);
-        var apiUrl = $"http://{settings.Host}:{settings.ApiGatewayEmulatorPort}/__lambda_test_tool_apigateway_health__";
+        var apiUrl = $"http://{settings.LambdaEmulatorHost}:{settings.ApiGatewayEmulatorPort}/__lambda_test_tool_apigateway_health__";
 
         // Act
         var runningTask = command.ExecuteAsync(context, settings, cancellationSource);
@@ -82,7 +82,7 @@ public async Task ExecuteAsync_EnvPorts_SuccessfulLaunch()
         var settings = new RunCommandSettings { ApiGatewayEmulatorMode = ApiGatewayEmulatorMode.HttpV2, NoLaunchWindow = true };
         var command = new RunCommand(_mockInteractiveService.Object, environmentManager);
         var context = new CommandContext(new List<string>(), _mockRemainingArgs.Object, "run", null);
-        var apiUrl = $"http://{settings.Host}:9765/__lambda_test_tool_apigateway_health__";
+        var apiUrl = $"http://{settings.LambdaEmulatorHost}:9765/__lambda_test_tool_apigateway_health__";
 
         // Act
         var runningTask = command.ExecuteAsync(context, settings, cancellationSource);
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/Settings/RunCommandSettingsTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/Settings/RunCommandSettingsTests.cs
index 64036ed36..422c623fe 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/Settings/RunCommandSettingsTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Commands/Settings/RunCommandSettingsTests.cs
@@ -15,7 +15,7 @@ public void DefaultHost_IsSetToConstantsDefaultHost()
         var settings = new RunCommandSettings();
 
         // Assert
-        Assert.Equal(Constants.DefaultHost, settings.Host);
+        Assert.Equal(Constants.DefaultLambdaEmulatorHost, settings.LambdaEmulatorHost);
     }
 
     [Fact]
@@ -25,7 +25,7 @@ public void DefaultPort_IsSetToConstantsDefaultPort()
         var settings = new RunCommandSettings();
 
         // Assert
-        Assert.Equal(Constants.DefaultLambdaRuntimeEmulatorPort, settings.Port);
+        Assert.Equal(Constants.DefaultLambdaEmulatorPort, settings.LambdaEmulatorPort);
     }
 
     [Fact]
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Processes/ApiGatewayEmulatorProcessTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Processes/ApiGatewayEmulatorProcessTests.cs
index bde8c3f69..acc0b3b00 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Processes/ApiGatewayEmulatorProcessTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/Processes/ApiGatewayEmulatorProcessTests.cs
@@ -22,7 +22,7 @@ public async Task RouteNotFound(ApiGatewayEmulatorMode mode, HttpStatusCode stat
         var cancellationSource = new CancellationTokenSource();
         cancellationSource.CancelAfter(5000);
         var settings = new RunCommandSettings { ApiGatewayEmulatorPort = 9003,  ApiGatewayEmulatorMode = mode, NoLaunchWindow = true};
-        var apiUrl = $"http://{settings.Host}:{settings.ApiGatewayEmulatorPort}/__lambda_test_tool_apigateway_health__";
+        var apiUrl = $"http://{settings.LambdaEmulatorHost}:{settings.ApiGatewayEmulatorPort}/__lambda_test_tool_apigateway_health__";
 
         // Act
         var process = ApiGatewayEmulatorProcess.Startup(settings, cancellationSource.Token);
diff --git a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
index 67180f6ff..d7c836169 100644
--- a/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
+++ b/Tools/LambdaTestTool-v2/tests/Amazon.Lambda.TestTool.UnitTests/RuntimeApiTests.cs
@@ -24,7 +24,7 @@ public async Task AddEventToDataStore()
 
         var cancellationTokenSource = new CancellationTokenSource();
         var options = new RunCommandSettings();
-        options.Port = 9000;
+        options.LambdaEmulatorPort = 9000;
         Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
         var testToolProcess = TestToolProcess.Startup(options, cancellationTokenSource.Token);
         try
@@ -53,7 +53,7 @@ public async Task AddEventToDataStore()
                 return input.ToUpper();
             };
 
-            System.Environment.SetEnvironmentVariable("AWS_LAMBDA_RUNTIME_API", $"{options.Host}:{options.Port}/{functionName}");
+            System.Environment.SetEnvironmentVariable("AWS_LAMBDA_RUNTIME_API", $"{options.LambdaEmulatorHost}:{options.LambdaEmulatorPort}/{functionName}");
             _ = LambdaBootstrapBuilder.Create(handler, new DefaultLambdaJsonSerializer())
                     .Build()
                     .RunAsync(cancellationTokenSource.Token);
@@ -74,7 +74,7 @@ public async Task InvokeRequestResponse()
 
         var cancellationTokenSource = new CancellationTokenSource();
         var options = new RunCommandSettings();
-        options.Port = 9001;
+        options.LambdaEmulatorPort = 9001;
         Environment.SetEnvironmentVariable("ASPNETCORE_ENVIRONMENT", "Development");
         var testToolProcess = TestToolProcess.Startup(options, cancellationTokenSource.Token);
         try
@@ -85,7 +85,7 @@ public async Task InvokeRequestResponse()
                 return input.ToUpper();
             };
 
-            System.Environment.SetEnvironmentVariable("AWS_LAMBDA_RUNTIME_API", $"{options.Host}:{options.Port}/{functionName}");
+            System.Environment.SetEnvironmentVariable("AWS_LAMBDA_RUNTIME_API", $"{options.LambdaEmulatorHost}:{options.LambdaEmulatorPort}/{functionName}");
             _ = LambdaBootstrapBuilder.Create(handler, new DefaultLambdaJsonSerializer())
                     .Build()
                     .RunAsync(cancellationTokenSource.Token);