Renam some functions to include