change of names to be consistent