rename some functions, as vet suggested