Change naming convention on server for v4 and v6