Bugfix: bad function names