changing naming and link structure