changed names to handle remote machines.