fixed function names . -> _