Changed some function names so that they do not start with "."