Rename variables of command line to remove ambiguity