changed some calls and normalized names