renaming/refactoring function names to avoid conflics