Changed function names to allow calling by string.