change naming according to mvidner