Updated names to work on host