Fixed a bug with function names