changed some function names to match other files