Changging function names to be inline with the API (part 2, minor changes to the functions which run on full folders )