fixes various names to be more clear