Rename internal functions