Rename some internal functions to have unique names
2 files changed