Tweaked some function names