Changing more grpchost/grpcport fields
diff --git a/marvin-cli/marvin_cli/management/engine.py b/marvin-cli/marvin_cli/management/engine.py
index ff33cd2..00ab26f 100644
--- a/marvin-cli/marvin_cli/management/engine.py
+++ b/marvin-cli/marvin_cli/management/engine.py
@@ -99,7 +99,7 @@
     help='Marvin engine action name')
 @click.option('--profiling', '-p', default=False, is_flag=True, help='Deterministic profiling of user code.')
 def dryrun(grpchost, grpcport, action, profiling):
-    rc = RemoteCalls(host, port)
+    rc = RemoteCalls(grpchost, grpcport)
     rc.run_dryrun(action, profiling)
 
 @cli.command("engine-grpcserver", help="Run gRPC of given actions.")
diff --git a/marvin-cli/marvin_cli/management/test.py b/marvin-cli/marvin_cli/management/test.py
index 6b7ffb6..8d3cded 100644
--- a/marvin-cli/marvin_cli/management/test.py
+++ b/marvin-cli/marvin_cli/management/test.py
@@ -30,7 +30,7 @@
 @click.option('--pdb', is_flag=True)
 @click.argument('args', default='')
 def test(grpchost, grpcport, cov, no_capture, pdb, args):
-    rc = RemoteCalls(host, port)
+    rc = RemoteCalls(grpchost, grpcport)
     rc.run_test(cov, no_capture, pdb, args)
 
 @cli.command('test-tox', help='Run tests using Tox environment.')
@@ -38,7 +38,7 @@
 @click.option('--grpcport', '-gp', prompt='gRPC port', help='gRPC Port', default='50057')
 @click.argument('args', default='--current-env')
 def tox(grpchost, grpcport, args):
-    rc = RemoteCalls(host, port)
+    rc = RemoteCalls(grpchost, grpcport)
     rc.run_tox(args)
 
 @cli.command('test-tdd', help='Watch for changes to run tests automatically.')
@@ -50,5 +50,5 @@
 @click.option('--partial', is_flag=True)
 @click.argument('args', default='')
 def tdd(grpchost, grpcport, cov, no_capture, pdb, partial, args):
-    rc = RemoteCalls(host, port)
+    rc = RemoteCalls(grpchost, grpcport)
     rc.run_tdd(cov, no_capture, pdb, partial, args)