Change name structure