Fix directory name for tunnels (all are singular)