Updated function names, setting names etc.