Fix host variable names