Renaming function names. Updating README.