Added all basic function renames