Change naming structure.