Changed function names -- should not contain dots