change function names to match