Adjust name and path for v2