Patch to rename variables $HOST and $PORT