Renaming internal functions;