Changed path and function names.